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

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

Issue 2154213002: Adding SSL Max Version flag to chrome://flags. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@tls13_const
Patch Set: Created 4 years, 5 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 (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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "components/network_session_configurator/switches.h" 46 #include "components/network_session_configurator/switches.h"
47 #include "components/ntp_snippets/ntp_snippets_constants.h" 47 #include "components/ntp_snippets/ntp_snippets_constants.h"
48 #include "components/ntp_tiles/switches.h" 48 #include "components/ntp_tiles/switches.h"
49 #include "components/offline_pages/offline_page_feature.h" 49 #include "components/offline_pages/offline_page_feature.h"
50 #include "components/omnibox/browser/omnibox_switches.h" 50 #include "components/omnibox/browser/omnibox_switches.h"
51 #include "components/password_manager/core/common/password_manager_features.h" 51 #include "components/password_manager/core/common/password_manager_features.h"
52 #include "components/proximity_auth/switches.h" 52 #include "components/proximity_auth/switches.h"
53 #include "components/search/search_switches.h" 53 #include "components/search/search_switches.h"
54 #include "components/security_state/switches.h" 54 #include "components/security_state/switches.h"
55 #include "components/signin/core/common/signin_switches.h" 55 #include "components/signin/core/common/signin_switches.h"
56 #include "components/ssl_config/ssl_config_prefs.h"
56 #include "components/sync_driver/sync_driver_switches.h" 57 #include "components/sync_driver/sync_driver_switches.h"
57 #include "components/tracing/common/tracing_switches.h" 58 #include "components/tracing/common/tracing_switches.h"
58 #include "components/translate/core/browser/translate_prefs.h" 59 #include "components/translate/core/browser/translate_prefs.h"
59 #include "components/version_info/version_info.h" 60 #include "components/version_info/version_info.h"
60 #include "content/public/browser/user_metrics.h" 61 #include "content/public/browser/user_metrics.h"
61 #include "content/public/common/content_features.h" 62 #include "content/public/common/content_features.h"
62 #include "content/public/common/content_switches.h" 63 #include "content/public/common/content_switches.h"
63 #include "content/public/common/feature_h264_with_openh264_ffmpeg.h" 64 #include "content/public/common/feature_h264_with_openh264_ffmpeg.h"
64 #include "content/public/common/features.h" 65 #include "content/public/common/features.h"
65 #include "gin/public/gin_features.h" 66 #include "gin/public/gin_features.h"
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 switches::kEnableWebFontsInterventionV2, 585 switches::kEnableWebFontsInterventionV2,
585 switches::kEnableWebFontsInterventionV2SwitchValueEnabledWith2G}, 586 switches::kEnableWebFontsInterventionV2SwitchValueEnabledWith2G},
586 {IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_V2_CHOICE_ENABLED_WITH_SLOW2G, 587 {IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_V2_CHOICE_ENABLED_WITH_SLOW2G,
587 switches::kEnableWebFontsInterventionV2, 588 switches::kEnableWebFontsInterventionV2,
588 switches::kEnableWebFontsInterventionV2SwitchValueEnabledWithSlow2G}, 589 switches::kEnableWebFontsInterventionV2SwitchValueEnabledWithSlow2G},
589 {IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_V2_CHOICE_DISABLED, 590 {IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_V2_CHOICE_DISABLED,
590 switches::kEnableWebFontsInterventionV2, 591 switches::kEnableWebFontsInterventionV2,
591 switches::kEnableWebFontsInterventionV2SwitchValueDisabled}, 592 switches::kEnableWebFontsInterventionV2SwitchValueDisabled},
592 }; 593 };
593 594
595 const FeatureEntry::Choice kSSLVersionMaxChoices[] = {
596 {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
597 {IDS_FLAGS_SSL_VERSION_MAX_TLS12, ssl_config::prefs::kSSLVersionMax,
598 "tls1.2"},
599 {IDS_FLAGS_SSL_VERSION_MAX_TLS13, ssl_config::prefs::kSSLVersionMax,
600 "tls1.3"},
601 };
602
594 // RECORDING USER METRICS FOR FLAGS: 603 // RECORDING USER METRICS FOR FLAGS:
595 // ----------------------------------------------------------------------------- 604 // -----------------------------------------------------------------------------
596 // The first line of the entry is the internal name. If you'd like to gather 605 // The first line of the entry is the internal name. If you'd like to gather
597 // statistics about the usage of your flag, you should append a marker comment 606 // statistics about the usage of your flag, you should append a marker comment
598 // to the end of the feature name, like so: 607 // to the end of the feature name, like so:
599 // "my-special-feature", // FLAGS:RECORD_UMA 608 // "my-special-feature", // FLAGS:RECORD_UMA
600 // 609 //
601 // After doing that, run 610 // After doing that, run
602 // tools/metrics/actions/extract_actions.py 611 // tools/metrics/actions/extract_actions.py
603 // to add the metric to actions.xml (which will enable UMA to record your 612 // to add the metric to actions.xml (which will enable UMA to record your
(...skipping 1186 matching lines...) Expand 10 before | Expand all | Expand 10 after
1790 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_NAME, 1799 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_NAME,
1791 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_DESCRIPTION, kOsAll, 1800 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_DESCRIPTION, kOsAll,
1792 MULTI_VALUE_TYPE(kEnableWebFontsInterventionV2Choices)}, 1801 MULTI_VALUE_TYPE(kEnableWebFontsInterventionV2Choices)},
1793 {"enable-webfonts-intervention-trigger", 1802 {"enable-webfonts-intervention-trigger",
1794 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_TRIGGER_NAME, 1803 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_TRIGGER_NAME,
1795 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_TRIGGER_DESCRIPTION, kOsAll, 1804 IDS_FLAGS_ENABLE_WEBFONTS_INTERVENTION_TRIGGER_DESCRIPTION, kOsAll,
1796 SINGLE_VALUE_TYPE(switches::kEnableWebFontsInterventionTrigger)}, 1805 SINGLE_VALUE_TYPE(switches::kEnableWebFontsInterventionTrigger)},
1797 {"enable-grouped-history", IDS_FLAGS_ENABLE_GROUPED_HISTORY_NAME, 1806 {"enable-grouped-history", IDS_FLAGS_ENABLE_GROUPED_HISTORY_NAME,
1798 IDS_FLAGS_ENABLE_GROUPED_HISTORY_DESCRIPTION, kOsDesktop, 1807 IDS_FLAGS_ENABLE_GROUPED_HISTORY_DESCRIPTION, kOsDesktop,
1799 SINGLE_VALUE_TYPE(switches::kHistoryEnableGroupByDomain)}, 1808 SINGLE_VALUE_TYPE(switches::kHistoryEnableGroupByDomain)},
1809 {"ssl-version-max", IDS_FLAGS_SSL_VERSION_MAX_NAME,
1810 IDS_FLAGS_SSL_VERSION_MAX_DESCRIPTION, kOsAll,
1811 MULTI_VALUE_TYPE(kSSLVersionMaxChoices)},
1800 {"enable-token-binding", IDS_FLAGS_ENABLE_TOKEN_BINDING_NAME, 1812 {"enable-token-binding", IDS_FLAGS_ENABLE_TOKEN_BINDING_NAME,
1801 IDS_FLAGS_ENABLE_TOKEN_BINDING_DESCRIPTION, kOsAll, 1813 IDS_FLAGS_ENABLE_TOKEN_BINDING_DESCRIPTION, kOsAll,
1802 FEATURE_VALUE_TYPE(features::kTokenBinding)}, 1814 FEATURE_VALUE_TYPE(features::kTokenBinding)},
1803 {"enable-scroll-anchoring", IDS_FLAGS_ENABLE_SCROLL_ANCHORING_NAME, 1815 {"enable-scroll-anchoring", IDS_FLAGS_ENABLE_SCROLL_ANCHORING_NAME,
1804 IDS_FLAGS_ENABLE_SCROLL_ANCHORING_DESCRIPTION, kOsAll, 1816 IDS_FLAGS_ENABLE_SCROLL_ANCHORING_DESCRIPTION, kOsAll,
1805 FEATURE_VALUE_TYPE(features::kScrollAnchoring)}, 1817 FEATURE_VALUE_TYPE(features::kScrollAnchoring)},
1806 {"disable-audio-support-for-desktop-share", 1818 {"disable-audio-support-for-desktop-share",
1807 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE, 1819 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE,
1808 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll, 1820 IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
1809 SINGLE_VALUE_TYPE(switches::kDisableAudioSupportForDesktopShare)}, 1821 SINGLE_VALUE_TYPE(switches::kDisableAudioSupportForDesktopShare)},
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
2143 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2155 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2144 2156
2145 const FeatureEntry* GetFeatureEntries(size_t* count) { 2157 const FeatureEntry* GetFeatureEntries(size_t* count) {
2146 *count = arraysize(kFeatureEntries); 2158 *count = arraysize(kFeatureEntries);
2147 return kFeatureEntries; 2159 return kFeatureEntries;
2148 } 2160 }
2149 2161
2150 } // namespace testing 2162 } // namespace testing
2151 2163
2152 } // namespace about_flags 2164 } // namespace about_flags
OLDNEW
« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698