diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-26 04:34:16 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-26 04:34:16 +0000 |
| commit | 46971929dc97fe73051c409b3276ba494901e64b (patch) | |
| tree | cf2583a6c37bafcc6b585e3ee49561fc5744c4d8 /chrome/installer/mini_installer.gypi | |
| parent | 3ea38a8008900b4a6504e7e4f8c47e38c94c9ec6 (diff) | |
| download | chromium_src-46971929dc97fe73051c409b3276ba494901e64b.zip chromium_src-46971929dc97fe73051c409b3276ba494901e64b.tar.gz chromium_src-46971929dc97fe73051c409b3276ba494901e64b.tar.bz2 | |
Remove the enable_metro GYP flag, effectively making it on by default.
The flag was mostly redundant with the enable_touch_ui flag, the only
additional effect of turning it on was to change the behavior of
ui::GetDisplayLayout.
If we later wanted to duplicate the effect that disabling the
enable_metro flag prior to this change would have, we can simply
change the condition in common.gypi that determines whether to turn on
the enable_touch_ui flag.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/10440037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/mini_installer.gypi')
| -rw-r--r-- | chrome/installer/mini_installer.gypi | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi index 249135b..8b5d5d0 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 @@ }, }], ], -}
\ No newline at end of file +} |