diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-16 20:48:51 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-16 20:48:51 +0000 |
| commit | 3d38d8e4427433cc57f62658f09c3480b18b0d92 (patch) | |
| tree | 43ae9368d16c03b78986518e6e088b26a4e4b37a /build | |
| parent | a45bda1f74849eb77a4f9140dbeab5ee23b634a8 (diff) | |
| download | chromium_src-3d38d8e4427433cc57f62658f09c3480b18b0d92.zip chromium_src-3d38d8e4427433cc57f62658f09c3480b18b0d92.tar.gz chromium_src-3d38d8e4427433cc57f62658f09c3480b18b0d92.tar.bz2 | |
Made full tab file browser to open automatically when a new disk device is properly mounted.
BUG=chromium-os:14215
TEST=plug in SD card or USB key, observe file browser opens and navigates to that new device
Review URL: http://codereview.chromium.org/6865033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/build/common.gypi b/build/common.gypi index 3eab5ac..6333160 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -23,14 +23,10 @@ # Disable touch support by default. 'touchui%': 0, - - # Disable file manager component extension by default. - 'file_manager_extension%': 0, }, # Copy conditionally-set variables out one scope. 'chromeos%': '<(chromeos)', 'touchui%': '<(touchui)', - 'file_manager_extension%': '<(file_manager_extension)', # To do a shared build on linux we need to be able to choose between # type static_library and shared_library. We default to doing a static @@ -65,7 +61,6 @@ # Copy conditionally-set variables out one scope. 'chromeos%': '<(chromeos)', 'touchui%': '<(touchui)', - 'file_manager_extension%': '<(file_manager_extension)', 'host_arch%': '<(host_arch)', 'library%': '<(library)', 'toolkit_views%': '<(toolkit_views)', @@ -96,6 +91,9 @@ # compilation. 'fastbuild%': 0, + # Disable file manager component extension by default. + 'file_manager_extension%': 0, + # Python version. 'python_ver%': '2.5', @@ -167,6 +165,13 @@ }, { 'enable_flapper_hacks%': 0, }], + + # Enable file manager extension by default on Chrome OS. + ['chromeos==1', { + 'file_manager_extension%': 1, + }, { + 'file_manager_extension%': 0, + }], ], }, |