diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 16:44:47 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 16:44:47 +0000 |
| commit | f35a9d1b289827e2f21a23fdafadf5c3c6a21a2d (patch) | |
| tree | e72bac3e6d15a5551da95f62a4fe03736fef5735 /build | |
| parent | fdbafc367cea40b38b2e7a0424242e73979ca12f (diff) | |
| download | chromium_src-f35a9d1b289827e2f21a23fdafadf5c3c6a21a2d.zip chromium_src-f35a9d1b289827e2f21a23fdafadf5c3c6a21a2d.tar.gz chromium_src-f35a9d1b289827e2f21a23fdafadf5c3c6a21a2d.tar.bz2 | |
Revert 102113 - 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
TBR=jamescook@chromium.org
Review URL: http://codereview.chromium.org/7976025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -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 cdc02e0..5b77b1c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -262,8 +262,8 @@ 'enable_flapper_hacks%': 0, }], - # 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', { + # Enable file manager extension by default on Chrome OS. + ['chromeos==1', { 'file_manager_extension%': 1, }, { 'file_manager_extension%': 0, |