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: http://src.chromium.org/svn/trunk/src/build@139181 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

common.gypi

@@ -43,10 +43,6 @@
           # Enable touch optimized art assets and metrics.
           'enable_touch_ui%': 0,
 
-          # Enable inclusion of touch-optimized resources.
-          # TODO(joi): Rename to enable_touch_assets.
-          'enable_metro%': 0,
-
           # Is this change part of the android upstream bringup?
           # Allows us to *temporarily* disable certain things for
           # staging.  Only set to 1 in a GYP_DEFINES.
@@ -71,7 +67,6 @@
         'enable_viewport%': '<(enable_viewport)',
         'enable_hidpi%': '<(enable_hidpi)',
         'enable_touch_ui%': '<(enable_touch_ui)',
-        'enable_metro%': '<(enable_metro)',
         'android_upstream_bringup%': '<(android_upstream_bringup)',
         'buildtype%': '<(buildtype)',
 
@@ -117,7 +112,7 @@
           }],
 
           # Enable touch UI on Metro and Chrome OS.
-          ['enable_metro==1 or chromeos==1', {
+          ['OS=="win" or chromeos==1', {
             'enable_touch_ui%': 1,
           }],
         ],
@@ -134,7 +129,6 @@
       'enable_viewport%': '<(enable_viewport)',
       'enable_hidpi%': '<(enable_hidpi)',
       'enable_touch_ui%': '<(enable_touch_ui)',
-      'enable_metro%': '<(enable_metro)',
       'android_upstream_bringup%': '<(android_upstream_bringup)',
 
       # We used to provide a variable for changing how libraries were built.
@@ -532,7 +526,6 @@
     'enable_viewport%': '<(enable_viewport)',
     'enable_hidpi%': '<(enable_hidpi)',
     'enable_touch_ui%': '<(enable_touch_ui)',
-    'enable_metro%': '<(enable_metro)',
     'use_xi2_mt%':'<(use_xi2_mt)',
     'file_manager_extension%': '<(file_manager_extension)',
     'webui_task_manager%': '<(webui_task_manager)',
@@ -1351,9 +1344,6 @@
       ['enable_hidpi==1', {
         'defines': ['ENABLE_HIDPI=1'],
       }],
-      ['enable_metro==1', {
-        'defines': ['ENABLE_METRO=1'],
-      }],
       ['OS=="android" and gtest_target_type=="shared_library"', {
         'defines': ['ANDROID_APK_TEST_TARGET=1'],
       }],