diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-01 04:11:48 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-01 04:11:48 +0000 |
| commit | 447a7e9d1e4a1fcf34c669fd724e5bb1858fd11f (patch) | |
| tree | 8f02ed12fe2e9eead4b376da7e2a30427a06726e /chrome/chrome_resources.gyp | |
| parent | 6f6e42e0e2faa6d455d87e2e122c2adbadbc2cef (diff) | |
| download | chromium_src-447a7e9d1e4a1fcf34c669fd724e5bb1858fd11f.zip chromium_src-447a7e9d1e4a1fcf34c669fd724e5bb1858fd11f.tar.gz chromium_src-447a7e9d1e4a1fcf34c669fd724e5bb1858fd11f.tar.bz2 | |
Makes chrome://omnibox use mojo
For the time being I'm moving chrome://omnibox behind USE_MOJO. Dave
has a patch out to enable USE_MOJO for Mac, which means it's only
android that won't have it for the time being.
BUG=none
TEST=none
R=darin@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=262176
Review URL: https://codereview.chromium.org/222543004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267414 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_resources.gyp')
| -rw-r--r-- | chrome/chrome_resources.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index a299f1e..ea06883 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -6,6 +6,7 @@ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html', 'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/internal/additional_modules_list.txt', + 'omnibox_mojom_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/omnibox/omnibox.mojom.js', }, 'targets': [ { @@ -162,6 +163,7 @@ 'dependencies': [ 'about_credits', 'chrome_internal_resources_gen', + 'chrome_web_ui_mojo_bindings.gyp:web_ui_mojo_bindings', ], 'actions': [ # Data resources. @@ -172,6 +174,7 @@ 'grit_additional_defines': [ '-E', 'about_credits_file=<(about_credits_file)', '-E', 'additional_modules_list_file=<(additional_modules_list_file)', + '-E', 'omnibox_mojom_file=<(omnibox_mojom_file)', ], }, 'includes': [ '../build/grit_action.gypi' ], |