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

Unified Diff: build/common.gypi

Issue 143733002: Remove FILE_MANAGER_EXTENSION and related configuration. They can be folded back to Chrome OS as co… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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/theme/theme_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index d005e6e897f3888b292de0925941a3f5f4d425be..4aee1ca834c99715e8e84520e31fc548fa0bb92c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -274,9 +274,6 @@
# Note: this setting is ignored if buildtype=="Official".
'tracing_like_official_build%': 0,
- # Disable file manager component extension by default.
- 'file_manager_extension%': 0,
-
# Disable image loader component extension by default.
'image_loader_extension%': 0,
@@ -599,12 +596,10 @@
'use_titlecase_in_grd_files%': 1,
}],
- # Enable file manager and image loader extensions on Chrome OS.
+ # Enable loader extensions on Chrome OS.
['chromeos==1', {
- 'file_manager_extension%': 1,
'image_loader_extension%': 1,
}, {
- 'file_manager_extension%': 0,
'image_loader_extension%': 0,
}],
@@ -904,7 +899,6 @@
'enable_hidpi%': '<(enable_hidpi)',
'enable_touch_ui%': '<(enable_touch_ui)',
'use_xi2_mt%':'<(use_xi2_mt)',
- 'file_manager_extension%': '<(file_manager_extension)',
'image_loader_extension%': '<(image_loader_extension)',
'fastbuild%': '<(fastbuild)',
'dcheck_always_on%': '<(dcheck_always_on)',
@@ -1690,9 +1684,6 @@
['use_ozone==1', {
'grit_defines': ['-D', 'use_ozone'],
}],
- ['file_manager_extension==1', {
- 'grit_defines': ['-D', 'file_manager_extension'],
- }],
['image_loader_extension==1', {
'grit_defines': ['-D', 'image_loader_extension'],
}],
@@ -2175,9 +2166,6 @@
['use_xi2_mt!=0 and use_x11==1', {
'defines': ['USE_XI2_MT=<(use_xi2_mt)'],
}],
- ['file_manager_extension==1', {
- 'defines': ['FILE_MANAGER_EXTENSION=1'],
- }],
['image_loader_extension==1', {
'defines': ['IMAGE_LOADER_EXTENSION=1'],
}],
« no previous file with comments | « no previous file | chrome/app/theme/theme_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698