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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2560203003: Remove SecurityChips experiment and flags (Closed)
Patch Set: pkasting comments Created 4 years 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 | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 switches::kEnableWebFontsInterventionV2, 590 switches::kEnableWebFontsInterventionV2,
591 switches::kEnableWebFontsInterventionV2SwitchValueDisabled}, 591 switches::kEnableWebFontsInterventionV2SwitchValueDisabled},
592 }; 592 };
593 593
594 const FeatureEntry::Choice kSSLVersionMaxChoices[] = { 594 const FeatureEntry::Choice kSSLVersionMaxChoices[] = {
595 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 595 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
596 {IDS_FLAGS_SSL_VERSION_MAX_TLS12, switches::kSSLVersionMax, "tls1.2"}, 596 {IDS_FLAGS_SSL_VERSION_MAX_TLS12, switches::kSSLVersionMax, "tls1.2"},
597 {IDS_FLAGS_SSL_VERSION_MAX_TLS13, switches::kSSLVersionMax, "tls1.3"}, 597 {IDS_FLAGS_SSL_VERSION_MAX_TLS13, switches::kSSLVersionMax, "tls1.3"},
598 }; 598 };
599 599
600 const FeatureEntry::Choice kSecurityChipChoices[] = {
601 {IDS_FLAGS_SECURITY_CHIP_DEFAULT, "", ""},
602 {IDS_FLAGS_SECURITY_CHIP_SHOW_NONSECURE_ONLY, switches::kSecurityChip,
603 switches::kSecurityChipShowNonSecureOnly},
604 {IDS_FLAGS_SECURITY_CHIP_SHOW_ALL, switches::kSecurityChip,
605 switches::kSecurityChipShowAll},
606 };
607
608 const FeatureEntry::Choice kSecurityChipAnimationChoices[] = {
609 {IDS_FLAGS_SECURITY_CHIP_ANIMATION_DEFAULT, "", ""},
610 {IDS_FLAGS_SECURITY_CHIP_ANIMATION_NONE, switches::kSecurityChipAnimation,
611 switches::kSecurityChipAnimationNone},
612 {IDS_FLAGS_SECURITY_CHIP_ANIMATION_NONSECURE_ONLY,
613 switches::kSecurityChipAnimation,
614 switches::kSecurityChipAnimationNonSecureOnly},
615 {IDS_FLAGS_SECURITY_CHIP_ANIMATION_ALL, switches::kSecurityChipAnimation,
616 switches::kSecurityChipAnimationAll},
617 };
618
619 #if !defined(OS_ANDROID) 600 #if !defined(OS_ANDROID)
620 const FeatureEntry::Choice kEnableDefaultMediaSessionChoices[] = { 601 const FeatureEntry::Choice kEnableDefaultMediaSessionChoices[] = {
621 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_DISABLED, "", ""}, 602 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_DISABLED, "", ""},
622 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_ENABLED, 603 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_ENABLED,
623 switches::kEnableDefaultMediaSession, ""}, 604 switches::kEnableDefaultMediaSession, ""},
624 #if BUILDFLAG(ENABLE_PLUGINS) 605 #if BUILDFLAG(ENABLE_PLUGINS)
625 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_ENABLED_DUCK_FLASH, 606 {IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_ENABLED_DUCK_FLASH,
626 switches::kEnableDefaultMediaSession, 607 switches::kEnableDefaultMediaSession,
627 switches::kEnableDefaultMediaSessionDuckFlash}, 608 switches::kEnableDefaultMediaSessionDuckFlash},
628 #endif // BUILDFLAG(ENABLE_PLUGINS) 609 #endif // BUILDFLAG(ENABLE_PLUGINS)
(...skipping 1419 matching lines...) Expand 10 before | Expand all | Expand 10 after
2048 {"saveas-menu-text-experiment", IDS_FLAGS_SAVEAS_MENU_LABEL_EXPERIMENT_NAME, 2029 {"saveas-menu-text-experiment", IDS_FLAGS_SAVEAS_MENU_LABEL_EXPERIMENT_NAME,
2049 IDS_FLAGS_SAVEAS_MENU_LABEL_EXPERIMENT_DESCRIPTION, kOsDesktop, 2030 IDS_FLAGS_SAVEAS_MENU_LABEL_EXPERIMENT_DESCRIPTION, kOsDesktop,
2050 SINGLE_VALUE_TYPE(switches::kEnableSaveAsMenuLabelExperiment)}, 2031 SINGLE_VALUE_TYPE(switches::kEnableSaveAsMenuLabelExperiment)},
2051 {"enable-generic-sensor", IDS_FLAGS_ENABLE_GENERIC_SENSOR_NAME, 2032 {"enable-generic-sensor", IDS_FLAGS_ENABLE_GENERIC_SENSOR_NAME,
2052 IDS_FLAGS_ENABLE_GENERIC_SENSOR_DESCRIPTION, kOsAll, 2033 IDS_FLAGS_ENABLE_GENERIC_SENSOR_DESCRIPTION, kOsAll,
2053 FEATURE_VALUE_TYPE(features::kGenericSensor)}, 2034 FEATURE_VALUE_TYPE(features::kGenericSensor)},
2054 {"expensive-background-timer-throttling", 2035 {"expensive-background-timer-throttling",
2055 IDS_FLAGS_EXPENSIVE_BACKGROUND_TIMER_THROTTLING_NAME, 2036 IDS_FLAGS_EXPENSIVE_BACKGROUND_TIMER_THROTTLING_NAME,
2056 IDS_FLAGS_EXPENSIVE_BACKGROUND_TIMER_THROTTLING_DESCRIPTION, kOsAll, 2037 IDS_FLAGS_EXPENSIVE_BACKGROUND_TIMER_THROTTLING_DESCRIPTION, kOsAll,
2057 FEATURE_VALUE_TYPE(features::kExpensiveBackgroundTimerThrottling)}, 2038 FEATURE_VALUE_TYPE(features::kExpensiveBackgroundTimerThrottling)},
2058 {"security-chip", IDS_FLAGS_SECURITY_CHIP_NAME,
2059 IDS_FLAGS_SECURITY_CHIP_DESCRIPTION, kOsDesktop,
2060 MULTI_VALUE_TYPE(kSecurityChipChoices)},
2061 {"security-chip-animation", IDS_FLAGS_SECURITY_CHIP_ANIMATION_NAME,
2062 IDS_FLAGS_SECURITY_CHIP_ANIMATION_DESCRIPTION, kOsDesktop,
2063 MULTI_VALUE_TYPE(kSecurityChipAnimationChoices)},
2064 #if defined(OS_CHROMEOS) 2039 #if defined(OS_CHROMEOS)
2065 {"enumerate-audio-devices", IDS_FLAGS_ENABLE_ENUMERATING_AUDIO_DEVICES_NAME, 2040 {"enumerate-audio-devices", IDS_FLAGS_ENABLE_ENUMERATING_AUDIO_DEVICES_NAME,
2066 IDS_FLAGS_ENABLE_ENUMERATING_AUDIO_DEVICES_DESCRIPTION, kOsCrOS, 2041 IDS_FLAGS_ENABLE_ENUMERATING_AUDIO_DEVICES_DESCRIPTION, kOsCrOS,
2067 FEATURE_VALUE_TYPE(features::kEnumerateAudioDevices)}, 2042 FEATURE_VALUE_TYPE(features::kEnumerateAudioDevices)},
2068 #endif // OS_CHROMEOS 2043 #endif // OS_CHROMEOS
2069 #if !defined(OS_ANDROID) 2044 #if !defined(OS_ANDROID)
2070 {"enable-default-media-session", 2045 {"enable-default-media-session",
2071 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_NAME, 2046 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_NAME,
2072 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_DESCRIPTION, kOsDesktop, 2047 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_DESCRIPTION, kOsDesktop,
2073 MULTI_VALUE_TYPE(kEnableDefaultMediaSessionChoices)}, 2048 MULTI_VALUE_TYPE(kEnableDefaultMediaSessionChoices)},
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
2336 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2311 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2337 2312
2338 const FeatureEntry* GetFeatureEntries(size_t* count) { 2313 const FeatureEntry* GetFeatureEntries(size_t* count) {
2339 *count = arraysize(kFeatureEntries); 2314 *count = arraysize(kFeatureEntries);
2340 return kFeatureEntries; 2315 return kFeatureEntries;
2341 } 2316 }
2342 2317
2343 } // namespace testing 2318 } // namespace testing
2344 2319
2345 } // namespace about_flags 2320 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698