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

Unified Diff: chrome/installer/mini_installer.gypi

Issue 10440037: Remove the enable_metro GYP flag, effectively making it on by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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
Index: chrome/installer/mini_installer.gypi
diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi
index 249135b76352dd8aac4a143f825ec637f70bc5e4..8b5d5d08963c9f2e8f138f6f7055203425b6b648 100644
--- a/chrome/installer/mini_installer.gypi
+++ b/chrome/installer/mini_installer.gypi
@@ -46,7 +46,7 @@
'ExceptionHandling': '0',
},
'VCLinkerTool': {
- 'OutputFile': '<(output_dir)/mini_installer.exe',
+ 'OutputFile': '<(output_dir)/mini_installer.exe',
'ProgramDatabaseFile': '<(output_dir)/mini_installer.pdb',
'MapFileName': '<(output_dir)/mini_installer.map',
'RandomizedBaseAddress': '1',
@@ -167,13 +167,13 @@
'enable_hidpi_flag': '',
},
}],
- ['enable_metro == 1', {
+ ['enable_touch_ui == 1', {
'variables': {
- 'enable_metro_flag': '--enable_metro=1',
+ 'enable_touch_ui_flag': '--enable_touch_ui=1',
},
}, {
'variables': {
- 'enable_metro_flag': '',
+ 'enable_touch_ui_flag': '',
},
}],
],
@@ -204,7 +204,7 @@
'--input_file=<(RULE_INPUT_PATH)',
'--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc',
'<(enable_hidpi_flag)',
- '<(enable_metro_flag)',
+ '<(enable_touch_ui_flag)',
# TODO(sgk): may just use environment variables
#'--distribution=$(CHROMIUM_BUILD)',
'--distribution=_google_chrome',
@@ -234,4 +234,4 @@
},
}],
],
-}
+}

Powered by Google App Engine
This is Rietveld 408576698