MD Settings: disable by default in M58

chrome/common/chrome_features.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/chrome_features.h"
 
 #include "extensions/features/features.h"
 #include "ppapi/features/features.h"
 
 namespace features {
@@ skipping 144 matching lines @@
 extern const base::Feature kAcknowledgeNtpOverrideOnDeactivate{
     "AcknowledgeNtpOverrideOnDeactivate", base::FEATURE_DISABLED_BY_DEFAULT};
 #endif
 
 // Enables or disables the Material Design version of chrome://history.
 const base::Feature kMaterialDesignHistory{"MaterialDesignHistory",
                                            base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Enables or disables the Material Design version of chrome://settings.
 // Also affects chrome://help.
-const base::Feature kMaterialDesignSettings {
-  "MaterialDesignSettings",
-#if defined(OS_CHROMEOS)
-      base::FEATURE_DISABLED_BY_DEFAULT
-#else
-      base::FEATURE_ENABLED_BY_DEFAULT
-#endif
-};
+const base::Feature kMaterialDesignSettings{"MaterialDesignSettings",
+                                            base::FEATURE_DISABLED_BY_DEFAULT};
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 // Enables media content bitstream remoting, an optimization that can activate
 // during Cast Tab Mirroring. When kMediaRemotingEncrypted is disabled, the
 // feature will not activate for encrypted content.
 const base::Feature kMediaRemoting{"MediaRemoting",
                                    base::FEATURE_DISABLED_BY_DEFAULT};
 const base::Feature kMediaRemotingEncrypted{"MediaRemotingEncrypted",
                                             base::FEATURE_DISABLED_BY_DEFAULT};
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
@@ skipping 113 matching lines @@
 // Enables or disables emoji, handwriting and voice input on opt-in IME menu.
 const base::Feature kEHVInputOnImeMenu{"EmojiHandwritingVoiceInput",
                                        base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Enables or disables flash component updates on Chrome OS.
 const base::Feature kCrosCompUpdates{"CrosCompUpdates",
                                      base::FEATURE_ENABLED_BY_DEFAULT};
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace features