Revert 171038

build/common.gypi

Index: build/common.gypi
===================================================================
--- build/common.gypi	(revision 171100)
+++ build/common.gypi	(working copy)
@@ -407,8 +407,6 @@
       'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86',
       'wix_path%': '<(DEPTH)/third_party/wix',
 
-      'enable_settings_app%': 0,
-
       'conditions': [
         # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
         # the 'conditions' clause.  Initial attempts resulted in chromium and
@@ -574,6 +572,13 @@
           # where possible to reduce ROM size.
           'use_system_libjpeg%': '<(android_build_type)',
         }],
+
+        # Enable Settings App only on Windows.
+        ['enable_app_list==1 and OS=="win"', {
+          'enable_settings_app%': 1,
+        }, {
+          'enable_settings_app%': 0,
+        }],
       ],
 
       # Set this to 1 to use the Google-internal file containing