summaryrefslogtreecommitdiffstats
path: root/build/common.gypi
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 20:26:19 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 20:26:19 +0000
commitf6e68091282a63e3d201cd13affc54f96b5f04d3 (patch)
treee3e31c04a067d877631370fd1425044ed52929bc /build/common.gypi
parente6a4d78c70426f6bce0558fca79b0a38ea12070f (diff)
downloadchromium_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 'build/common.gypi')
-rw-r--r--build/common.gypi4
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,