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

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

Issue 2772673002: mash: switch to the new pref service (Closed)
Patch Set: Remove no longer needed tests Created 3 years, 9 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
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 "base/command_line.h"
8 #include "chrome/common/chrome_switches.h"
7 #include "extensions/features/features.h" 9 #include "extensions/features/features.h"
8 #include "ppapi/features/features.h" 10 #include "ppapi/features/features.h"
9 11
10 namespace features { 12 namespace features {
11 13
12 // All features in alphabetical order. 14 // All features in alphabetical order.
13 15
14 #if defined(OS_ANDROID) 16 #if defined(OS_ANDROID)
15 const base::Feature kAllowAutoplayUnmutedInWebappManifestScope{ 17 const base::Feature kAllowAutoplayUnmutedInWebappManifestScope{
16 "AllowAutoplayUnmutedInWebappManifestScope", 18 "AllowAutoplayUnmutedInWebappManifestScope",
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 301
300 // Enables or disables emoji, handwriting and voice input on opt-in IME menu. 302 // Enables or disables emoji, handwriting and voice input on opt-in IME menu.
301 const base::Feature kEHVInputOnImeMenu{"EmojiHandwritingVoiceInput", 303 const base::Feature kEHVInputOnImeMenu{"EmojiHandwritingVoiceInput",
302 base::FEATURE_ENABLED_BY_DEFAULT}; 304 base::FEATURE_ENABLED_BY_DEFAULT};
303 305
304 // Enables or disables flash component updates on Chrome OS. 306 // Enables or disables flash component updates on Chrome OS.
305 const base::Feature kCrosCompUpdates{"CrosCompUpdates", 307 const base::Feature kCrosCompUpdates{"CrosCompUpdates",
306 base::FEATURE_ENABLED_BY_DEFAULT}; 308 base::FEATURE_ENABLED_BY_DEFAULT};
307 #endif // defined(OS_CHROMEOS) 309 #endif // defined(OS_CHROMEOS)
308 310
311 bool PrefServiceEnabled() {
Sam McNally 2017/03/27 05:42:10 DON'T ADD RANDOM STUFF HERE.
tibell 2017/03/28 00:34:31 ditto
312 return base::FeatureList::IsEnabled(features::kPrefService) ||
313 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
314 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
315 switches::kMusConfig) == switches::kMash;
jonross 2017/03/27 14:26:38 I'm a bit concerned about restricting this feature
tibell 2017/03/28 00:34:31 See my reply in shell.cc
jonross 2017/03/28 13:57:26 Acknowledged.
316 #else
317 false;
318 #endif
319 }
320
309 } // namespace features 321 } // namespace features
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698