Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Unified Diff: build/common.gypi

Issue 6865033: Made full tab file browser to open automatically when a new disk device is properly mounted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 81876)
+++ build/common.gypi (working copy)
@@ -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,
+ }],
],
},
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698