diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 20:26:19 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 20:26:19 +0000 |
| commit | f6e68091282a63e3d201cd13affc54f96b5f04d3 (patch) | |
| tree | e3e31c04a067d877631370fd1425044ed52929bc /chrome/browser/browser_resources.grd | |
| parent | e6a4d78c70426f6bce0558fca79b0a38ea12070f (diff) | |
| download | chromium_src-f6e68091282a63e3d201cd13affc54f96b5f04d3.zip chromium_src-f6e68091282a63e3d201cd13affc54f96b5f04d3.tar.gz chromium_src-f6e68091282a63e3d201cd13affc54f96b5f04d3.tar.bz2 | |
Aura: Use extension-based file picker from CrOS for pure-views builds.
Removes the dependency on chromeos-specific code in the extension-based file picker. Compiles, links, and runs, but the dialog doesn't function yet - there's still some work to do to wire up the private JavaScript API calls. See crbug.com/97424
BUG=chromium-os:20583
TEST=On plain ChromeOS, can still open a file with control-O file picker.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=102113
Review URL: http://codereview.chromium.org/7941014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 5ef0cc2..20d86f4 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -149,10 +149,12 @@ <include name="IDR_CHROMEVOX_MANIFEST" file="resources\access_chromevox\manifest.json" type="BINDATA" /> <!-- Enterprise enrollment dialog --> <include name="IDR_ENTERPRISE_ENROLLMENT_HTML" file="policy\resources\enrollment.html" flattenhtml="true" type="BINDATA" /> - <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\manifest.json" type="BINDATA" /> <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifest.json" type="BINDATA" /> <include name="IDR_GAIA_TEST_AUTH_MANIFEST" file="resources\gaia_auth\manifest_test.json" type="BINDATA" /> </if> + <if expr="pp_ifdef('file_manager_extension')"> + <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\manifest.json" type="BINDATA" /> + </if> <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json" type="BINDATA" /> </if> |