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

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

Issue 2937183002: Flip UseGroupedPermissionInfobars and UsePermissionManagerForMediaRequests (Closed)
Patch Set: no test changes now Created 3 years, 6 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 | « no previous file | 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/common/chrome_switches.h" 8 #include "chrome/common/chrome_switches.h"
9 #include "extensions/features/features.h" 9 #include "extensions/features/features.h"
10 #include "ppapi/features/features.h" 10 #include "ppapi/features/features.h"
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 base::FEATURE_ENABLED_BY_DEFAULT}; 330 base::FEATURE_ENABLED_BY_DEFAULT};
331 #endif 331 #endif
332 332
333 // Enables using the local NTP if Google is the default search engine. 333 // Enables using the local NTP if Google is the default search engine.
334 const base::Feature kUseGoogleLocalNtp{"UseGoogleLocalNtp", 334 const base::Feature kUseGoogleLocalNtp{"UseGoogleLocalNtp",
335 base::FEATURE_DISABLED_BY_DEFAULT}; 335 base::FEATURE_DISABLED_BY_DEFAULT};
336 336
337 // Experiment to use grouped permission infobars which could show and handle 337 // Experiment to use grouped permission infobars which could show and handle
338 // multiple permission requests. 338 // multiple permission requests.
339 const base::Feature kUseGroupedPermissionInfobars{ 339 const base::Feature kUseGroupedPermissionInfobars{
340 "UseGroupedPermissionInfobars", base::FEATURE_DISABLED_BY_DEFAULT}; 340 "UseGroupedPermissionInfobars", base::FEATURE_ENABLED_BY_DEFAULT};
341 341
342 // Feature to use the PermissionManager to show prompts for WebRTC permission 342 // Feature to use the PermissionManager to show prompts for WebRTC permission
343 // requests. 343 // requests.
344 const base::Feature kUsePermissionManagerForMediaRequests{ 344 const base::Feature kUsePermissionManagerForMediaRequests{
345 "UsePermissionManagerForMediaRequests", base::FEATURE_DISABLED_BY_DEFAULT}; 345 "UsePermissionManagerForMediaRequests", base::FEATURE_ENABLED_BY_DEFAULT};
346 346
347 #if defined(OS_CHROMEOS) 347 #if defined(OS_CHROMEOS)
348 // Enables or disables the opt-in IME menu in the language settings page. 348 // Enables or disables the opt-in IME menu in the language settings page.
349 const base::Feature kOptInImeMenu{"OptInImeMenu", 349 const base::Feature kOptInImeMenu{"OptInImeMenu",
350 base::FEATURE_ENABLED_BY_DEFAULT}; 350 base::FEATURE_ENABLED_BY_DEFAULT};
351 351
352 // Enables or disables pin quick unlock. 352 // Enables or disables pin quick unlock.
353 const base::Feature kQuickUnlockPin{"QuickUnlockPin", 353 const base::Feature kQuickUnlockPin{"QuickUnlockPin",
354 base::FEATURE_ENABLED_BY_DEFAULT}; 354 base::FEATURE_ENABLED_BY_DEFAULT};
355 355
(...skipping 30 matching lines...) Expand all
386 return base::FeatureList::IsEnabled(features::kPrefService) || 386 return base::FeatureList::IsEnabled(features::kPrefService) ||
387 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) 387 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
388 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( 388 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
389 switches::kMusConfig) == switches::kMash; 389 switches::kMusConfig) == switches::kMash;
390 #else 390 #else
391 false; 391 false;
392 #endif 392 #endif
393 } 393 }
394 394
395 } // namespace features 395 } // namespace features
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698