| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser/about_flags.h" | 5 #include "chrome/browser/about_flags.h" |
| 6 | 6 |
| 7 #include <iterator> | 7 #include <iterator> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 686 | 686 |
| 687 const FeatureEntry::Choice kSSLVersionMaxChoices[] = { | 687 const FeatureEntry::Choice kSSLVersionMaxChoices[] = { |
| 688 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, | 688 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, |
| 689 {flag_descriptions::kSslVersionMaxTls12, switches::kSSLVersionMax, | 689 {flag_descriptions::kSslVersionMaxTls12, switches::kSSLVersionMax, |
| 690 "tls1.2"}, | 690 "tls1.2"}, |
| 691 {flag_descriptions::kSslVersionMaxTls13, switches::kSSLVersionMax, | 691 {flag_descriptions::kSslVersionMaxTls13, switches::kSSLVersionMax, |
| 692 "tls1.3"}, | 692 "tls1.3"}, |
| 693 }; | 693 }; |
| 694 | 694 |
| 695 #if !defined(OS_ANDROID) | 695 #if !defined(OS_ANDROID) |
| 696 const FeatureEntry::Choice kEnableDefaultMediaSessionChoices[] = { | 696 const FeatureEntry::Choice kEnableAudioFocusChoices[] = { |
| 697 {flag_descriptions::kEnableDefaultMediaSessionDisabled, "", ""}, | 697 {flag_descriptions::kEnableAudioFocusDisabled, "", ""}, |
| 698 {flag_descriptions::kEnableDefaultMediaSessionEnabled, | 698 {flag_descriptions::kEnableAudioFocusEnabled, switches::kEnableAudioFocus, |
| 699 switches::kEnableDefaultMediaSession, ""}, | 699 ""}, |
| 700 #if BUILDFLAG(ENABLE_PLUGINS) | 700 #if BUILDFLAG(ENABLE_PLUGINS) |
| 701 {flag_descriptions::kEnableDefaultMediaSessionEnabledDuckFlash, | 701 {flag_descriptions::kEnableAudioFocusEnabledDuckFlash, |
| 702 switches::kEnableDefaultMediaSession, | 702 switches::kEnableAudioFocus, switches::kEnableAudioFocusDuckFlash}, |
| 703 switches::kEnableDefaultMediaSessionDuckFlash}, | |
| 704 #endif // BUILDFLAG(ENABLE_PLUGINS) | 703 #endif // BUILDFLAG(ENABLE_PLUGINS) |
| 705 }; | 704 }; |
| 706 #endif // !defined(OS_ANDROID) | 705 #endif // !defined(OS_ANDROID) |
| 707 | 706 |
| 708 const FeatureEntry::Choice kAutoplayPolicyChoices[] = { | 707 const FeatureEntry::Choice kAutoplayPolicyChoices[] = { |
| 709 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, | 708 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, |
| 710 {flag_descriptions::kAutoplayPolicyNoUserGestureRequired, | 709 {flag_descriptions::kAutoplayPolicyNoUserGestureRequired, |
| 711 switches::kAutoplayPolicy, | 710 switches::kAutoplayPolicy, |
| 712 switches::autoplay::kNoUserGestureRequiredPolicy}, | 711 switches::autoplay::kNoUserGestureRequiredPolicy}, |
| 713 #if defined(OS_ANDROID) | 712 #if defined(OS_ANDROID) |
| (...skipping 1814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2528 flag_descriptions::kExpensiveBackgroundTimerThrottlingName, | 2527 flag_descriptions::kExpensiveBackgroundTimerThrottlingName, |
| 2529 flag_descriptions::kExpensiveBackgroundTimerThrottlingDescription, kOsAll, | 2528 flag_descriptions::kExpensiveBackgroundTimerThrottlingDescription, kOsAll, |
| 2530 FEATURE_VALUE_TYPE(features::kExpensiveBackgroundTimerThrottling)}, | 2529 FEATURE_VALUE_TYPE(features::kExpensiveBackgroundTimerThrottling)}, |
| 2531 #if defined(OS_CHROMEOS) | 2530 #if defined(OS_CHROMEOS) |
| 2532 {"enumerate-audio-devices", | 2531 {"enumerate-audio-devices", |
| 2533 flag_descriptions::kEnableEnumeratingAudioDevicesName, | 2532 flag_descriptions::kEnableEnumeratingAudioDevicesName, |
| 2534 flag_descriptions::kEnableEnumeratingAudioDevicesDescription, kOsCrOS, | 2533 flag_descriptions::kEnableEnumeratingAudioDevicesDescription, kOsCrOS, |
| 2535 FEATURE_VALUE_TYPE(features::kEnumerateAudioDevices)}, | 2534 FEATURE_VALUE_TYPE(features::kEnumerateAudioDevices)}, |
| 2536 #endif // OS_CHROMEOS | 2535 #endif // OS_CHROMEOS |
| 2537 #if !defined(OS_ANDROID) | 2536 #if !defined(OS_ANDROID) |
| 2538 {"enable-default-media-session", | 2537 {"enable-audio-focus", flag_descriptions::kEnableAudioFocusName, |
| 2539 flag_descriptions::kEnableDefaultMediaSessionName, | 2538 flag_descriptions::kEnableAudioFocusDescription, kOsDesktop, |
| 2540 flag_descriptions::kEnableDefaultMediaSessionDescription, kOsDesktop, | 2539 MULTI_VALUE_TYPE(kEnableAudioFocusChoices)}, |
| 2541 MULTI_VALUE_TYPE(kEnableDefaultMediaSessionChoices)}, | |
| 2542 #endif // !OS_ANDROID | 2540 #endif // !OS_ANDROID |
| 2543 #if defined(OS_ANDROID) | 2541 #if defined(OS_ANDROID) |
| 2544 {"modal-permission-prompts", flag_descriptions::kModalPermissionPromptsName, | 2542 {"modal-permission-prompts", flag_descriptions::kModalPermissionPromptsName, |
| 2545 flag_descriptions::kModalPermissionPromptsDescription, kOsAndroid, | 2543 flag_descriptions::kModalPermissionPromptsDescription, kOsAndroid, |
| 2546 FEATURE_VALUE_TYPE(features::kModalPermissionPrompts)}, | 2544 FEATURE_VALUE_TYPE(features::kModalPermissionPrompts)}, |
| 2547 #endif | 2545 #endif |
| 2548 #if !defined(OS_MACOSX) | 2546 #if !defined(OS_MACOSX) |
| 2549 {"permission-prompt-persistence-toggle", | 2547 {"permission-prompt-persistence-toggle", |
| 2550 flag_descriptions::kPermissionPromptPersistenceToggleName, | 2548 flag_descriptions::kPermissionPromptPersistenceToggleName, |
| 2551 flag_descriptions::kPermissionPromptPersistenceToggleDescription, | 2549 flag_descriptions::kPermissionPromptPersistenceToggleDescription, |
| (...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3100 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3098 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 3101 | 3099 |
| 3102 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3100 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 3103 *count = arraysize(kFeatureEntries); | 3101 *count = arraysize(kFeatureEntries); |
| 3104 return kFeatureEntries; | 3102 return kFeatureEntries; |
| 3105 } | 3103 } |
| 3106 | 3104 |
| 3107 } // namespace testing | 3105 } // namespace testing |
| 3108 | 3106 |
| 3109 } // namespace about_flags | 3107 } // namespace about_flags |
| OLD | NEW |