Revert 171038

A better fix for the problem this revert was addressing has been checked in in r171097.

> Disable the settings app by default.
> 
> BUG=164064
> TBR=tapted, benwells
> 
> Review URL: https://codereview.chromium.org/11428167

TBR=erikwright@chromium.org
Review URL: https://codereview.chromium.org/11441002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171101 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

@@ -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