Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Side by Side Diff: chrome/common/chrome_features.cc

Issue 2699973002: MD Settings: enable by default in client (Closed)
Patch Set: disable cros Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/webui/options/options_ui_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/chrome_features.h" 5 #include "chrome/common/chrome_features.h"
6 6
7 #include "extensions/features/features.h" 7 #include "extensions/features/features.h"
8 #include "ppapi/features/features.h" 8 #include "ppapi/features/features.h"
9 9
10 namespace features { 10 namespace features {
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 extern const base::Feature kAcknowledgeNtpOverrideOnDeactivate{ 155 extern const base::Feature kAcknowledgeNtpOverrideOnDeactivate{
156 "AcknowledgeNtpOverrideOnDeactivate", base::FEATURE_DISABLED_BY_DEFAULT}; 156 "AcknowledgeNtpOverrideOnDeactivate", base::FEATURE_DISABLED_BY_DEFAULT};
157 #endif 157 #endif
158 158
159 // Enables or disables the Material Design version of chrome://history. 159 // Enables or disables the Material Design version of chrome://history.
160 const base::Feature kMaterialDesignHistory{"MaterialDesignHistory", 160 const base::Feature kMaterialDesignHistory{"MaterialDesignHistory",
161 base::FEATURE_ENABLED_BY_DEFAULT}; 161 base::FEATURE_ENABLED_BY_DEFAULT};
162 162
163 // Enables or disables the Material Design version of chrome://settings. 163 // Enables or disables the Material Design version of chrome://settings.
164 // Also affects chrome://help. 164 // Also affects chrome://help.
165 const base::Feature kMaterialDesignSettings{"MaterialDesignSettings", 165 const base::Feature kMaterialDesignSettings {
166 base::FEATURE_DISABLED_BY_DEFAULT}; 166 "MaterialDesignSettings",
167 #if defined(OS_CHROMEOS)
168 base::FEATURE_DISABLED_BY_DEFAULT
169 #else
170 base::FEATURE_ENABLED_BY_DEFAULT
171 #endif
172 };
167 173
168 #if !defined(OS_ANDROID) && !defined(OS_IOS) 174 #if !defined(OS_ANDROID) && !defined(OS_IOS)
169 // Enables media content bitstream remoting, an optimization that can activate 175 // Enables media content bitstream remoting, an optimization that can activate
170 // during Cast Tab Mirroring. When kMediaRemotingEncrypted is disabled, the 176 // during Cast Tab Mirroring. When kMediaRemotingEncrypted is disabled, the
171 // feature will not activate for encrypted content. 177 // feature will not activate for encrypted content.
172 const base::Feature kMediaRemoting{"MediaRemoting", 178 const base::Feature kMediaRemoting{"MediaRemoting",
173 base::FEATURE_DISABLED_BY_DEFAULT}; 179 base::FEATURE_DISABLED_BY_DEFAULT};
174 const base::Feature kMediaRemotingEncrypted{"MediaRemotingEncrypted", 180 const base::Feature kMediaRemotingEncrypted{"MediaRemotingEncrypted",
175 base::FEATURE_DISABLED_BY_DEFAULT}; 181 base::FEATURE_DISABLED_BY_DEFAULT};
176 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) 182 #endif // !defined(OS_ANDROID) && !defined(OS_IOS)
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 // Enables or disables emoji, handwriting and voice input on opt-in IME menu. 296 // Enables or disables emoji, handwriting and voice input on opt-in IME menu.
291 const base::Feature kEHVInputOnImeMenu{"EmojiHandwritingVoiceInput", 297 const base::Feature kEHVInputOnImeMenu{"EmojiHandwritingVoiceInput",
292 base::FEATURE_ENABLED_BY_DEFAULT}; 298 base::FEATURE_ENABLED_BY_DEFAULT};
293 299
294 // Enables or disables flash component updates on Chrome OS. 300 // Enables or disables flash component updates on Chrome OS.
295 const base::Feature kCrosCompUpdates{"CrosCompUpdates", 301 const base::Feature kCrosCompUpdates{"CrosCompUpdates",
296 base::FEATURE_ENABLED_BY_DEFAULT}; 302 base::FEATURE_ENABLED_BY_DEFAULT};
297 #endif // defined(OS_CHROMEOS) 303 #endif // defined(OS_CHROMEOS)
298 304
299 } // namespace features 305 } // namespace features
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/options_ui_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698