diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 19:24:20 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 19:24:20 +0000 |
| commit | 6b6c0acee895c03e9aa71bb99b40ffb1e1f6cd13 (patch) | |
| tree | 32faf47c06f0b68bc3ec8688d093a3815e1d9526 /chrome/browser/browser_resources.grd | |
| parent | eba06dcf44a3538a6e413a6f3886b9bc561f0883 (diff) | |
| download | chromium_src-6b6c0acee895c03e9aa71bb99b40ffb1e1f6cd13.zip chromium_src-6b6c0acee895c03e9aa71bb99b40ffb1e1f6cd13.tar.gz chromium_src-6b6c0acee895c03e9aa71bb99b40ffb1e1f6cd13.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
Review URL: https://codereview.chromium.org/222543004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 1debfb8..2425213 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -208,6 +208,7 @@ <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type="BINDATA" /> <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="BINDATA" /> + <include name="IDR_OMNIBOX_MOJO_JS" file="${omnibox_mojom_file}" use_base_dir="false" type="BINDATA"/> <if expr="not is_android"> <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA" /> |