diff options
author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 16:27:13 +0000 |
---|---|---|
committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 16:27:13 +0000 |
commit | 4d7a5cbb643a42dda662177d7ea232c28717d5c1 (patch) | |
tree | 26fd6d0eb0cd2822780179dfc64a78ab52eca1da /build/common.gypi | |
parent | 9e5b66dccfe795fb2473230dd4deaef2253d6490 (diff) | |
download | chromium_src-4d7a5cbb643a42dda662177d7ea232c28717d5c1.zip chromium_src-4d7a5cbb643a42dda662177d7ea232c28717d5c1.tar.gz chromium_src-4d7a5cbb643a42dda662177d7ea232c28717d5c1.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 and links, but does not yet run - the extension subsystem is not finding the resources for the file_manager component extension. The Aura build currently won't process keyboard or mouse events, so I don't have a good way to debug this. For now, added logging, and we'll get back to it when Aura is in better shape.
BUG=chromium-os:20583
TEST=On plain ChromeOS, can still open a file with control-O file picker.
Review URL: http://codereview.chromium.org/7941014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
-rw-r--r-- | build/common.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 5b77b1c..cdc02e0 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -262,8 +262,8 @@ 'enable_flapper_hacks%': 0, }], - # Enable file manager extension by default on Chrome OS. - ['chromeos==1', { + # Enable file manager extension on Chrome OS, Touch, PureView, Aura. + ['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', { 'file_manager_extension%': 1, }, { 'file_manager_extension%': 0, |