Omnibox: Non-Substituting Keywords Should Not Have a Space

(after the keyword)

BUG=316907

Review URL: https://codereview.chromium.org/66993004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234097 0039d316-1c4b-4281-b951-d872f2087c98
The back button on enrollment screen is needed to ensure that users don't end up being stuck there in case of connectivity errors.

BUG=314717
TEST=ProvisionedEnrollmentScreenTest.TestBackButton, WizardControllerKioskFlowTest.ControlFlowEnrollmentBack

Review URL: https://codereview.chromium.org/67073003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234098 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 234097
Add missing dependency on chrome_resources.gyp:chrome_strings

With disable_nacl=1 defined a clean build would fail because
grit/generated_resources.h was not generated. The file including
this was extensions/browser/admin_policy.cc.

This change makes extensions.gyp:extensions_browser depend
on chrome_resources.gyp:chrome_strings. The compile bug can be
reproduced by doing:

  export GYP_DEFINES="$GYP_DEFINES disable_nacl=1"
  ./build/gyp_chromium
  ninja -C out/Debug chromium

TEST=Successful compile
BUG=

Review URL: https://codereview.chromium.org/67173003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234099 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 234098
SVN changes up to revision 234099