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

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

Issue 2987563004: Revert of Use FrameIsAd to decide whether to isolate a frame in TopDocumentIsolation mode. (Closed)
Patch Set: Created 3 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
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/chrome_content_browser_client.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 1085 matching lines...) Expand 10 before | Expand all | Expand 10 after
1096 arraysize(kClientPlaceholdersForServerLoFiEnabled), nullptr}}; 1096 arraysize(kClientPlaceholdersForServerLoFiEnabled), nullptr}};
1097 1097
1098 const FeatureEntry::Choice kAsyncImageDecodingChoices[] = { 1098 const FeatureEntry::Choice kAsyncImageDecodingChoices[] = {
1099 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, 1099 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
1100 {flags_ui::kGenericExperimentChoiceEnabled, 1100 {flags_ui::kGenericExperimentChoiceEnabled,
1101 cc::switches::kEnableCheckerImaging, ""}, 1101 cc::switches::kEnableCheckerImaging, ""},
1102 {flags_ui::kGenericExperimentChoiceDisabled, 1102 {flags_ui::kGenericExperimentChoiceDisabled,
1103 cc::switches::kDisableCheckerImaging, ""}, 1103 cc::switches::kDisableCheckerImaging, ""},
1104 }; 1104 };
1105 1105
1106 #define DEFINE_TDI_MODE_FEATURE_PARAM(name, value, description) \
1107 const FeatureEntry::FeatureParam kTopDocumentIsolationVariations_##name[] = \
1108 {{features::kTopDocumentIsolationModeParam, #value}};
1109 FOR_EACH_TDI_MODE(DEFINE_TDI_MODE_FEATURE_PARAM)
1110 #undef DEFINE_TDI_MODE_FEATURE_PARAM
1111
1112 const FeatureEntry::FeatureVariation kTopDocumentIsolationVariations[] = {
1113 #define DEFINE_TDI_MODE_VARIATION(name, value, description) \
1114 {"(" #name " - " description ")", kTopDocumentIsolationVariations_##name, \
1115 arraysize(kTopDocumentIsolationVariations_##name), nullptr},
1116 FOR_EACH_TDI_MODE(DEFINE_TDI_MODE_VARIATION)
1117 #undef DEFINE_TDI_MODE_VARIATION
1118 };
1119
1120 // RECORDING USER METRICS FOR FLAGS: 1106 // RECORDING USER METRICS FOR FLAGS:
1121 // ----------------------------------------------------------------------------- 1107 // -----------------------------------------------------------------------------
1122 // The first line of the entry is the internal name. 1108 // The first line of the entry is the internal name.
1123 // 1109 //
1124 // To add a new entry, add to the end of kFeatureEntries. There are two 1110 // To add a new entry, add to the end of kFeatureEntries. There are two
1125 // distinct types of entries: 1111 // distinct types of entries:
1126 // . SINGLE_VALUE: entry is either on or off. Use the SINGLE_VALUE_TYPE 1112 // . SINGLE_VALUE: entry is either on or off. Use the SINGLE_VALUE_TYPE
1127 // macro for this type supplying the command line to the macro. 1113 // macro for this type supplying the command line to the macro.
1128 // . MULTI_VALUE: a list of choices, the first of which should correspond to a 1114 // . MULTI_VALUE: a list of choices, the first of which should correspond to a
1129 // deactivated state for this lab (i.e. no command line option). To specify 1115 // deactivated state for this lab (i.e. no command line option). To specify
(...skipping 842 matching lines...) Expand 10 before | Expand all | Expand 10 after
1972 MULTI_VALUE_TYPE(kMarkHttpAsChoices)}, 1958 MULTI_VALUE_TYPE(kMarkHttpAsChoices)},
1973 {"enable-http-form-warning", flag_descriptions::kEnableHttpFormWarningName, 1959 {"enable-http-form-warning", flag_descriptions::kEnableHttpFormWarningName,
1974 flag_descriptions::kEnableHttpFormWarningDescription, kOsAll, 1960 flag_descriptions::kEnableHttpFormWarningDescription, kOsAll,
1975 FEATURE_VALUE_TYPE(security_state::kHttpFormWarningFeature)}, 1961 FEATURE_VALUE_TYPE(security_state::kHttpFormWarningFeature)},
1976 {"enable-site-per-process", flag_descriptions::kSitePerProcessName, 1962 {"enable-site-per-process", flag_descriptions::kSitePerProcessName,
1977 flag_descriptions::kSitePerProcessDescription, kOsAll, 1963 flag_descriptions::kSitePerProcessDescription, kOsAll,
1978 SINGLE_VALUE_TYPE(switches::kSitePerProcess)}, 1964 SINGLE_VALUE_TYPE(switches::kSitePerProcess)},
1979 {"enable-top-document-isolation", 1965 {"enable-top-document-isolation",
1980 flag_descriptions::kTopDocumentIsolationName, 1966 flag_descriptions::kTopDocumentIsolationName,
1981 flag_descriptions::kTopDocumentIsolationDescription, kOsAll, 1967 flag_descriptions::kTopDocumentIsolationDescription, kOsAll,
1982 FEATURE_WITH_PARAMS_VALUE_TYPE(features::kTopDocumentIsolation, 1968 FEATURE_VALUE_TYPE(features::kTopDocumentIsolation)},
1983 kTopDocumentIsolationVariations,
1984 "TopDocumentIsolation")},
1985 {"enable-use-zoom-for-dsf", flag_descriptions::kEnableUseZoomForDsfName, 1969 {"enable-use-zoom-for-dsf", flag_descriptions::kEnableUseZoomForDsfName,
1986 flag_descriptions::kEnableUseZoomForDsfDescription, kOsAll, 1970 flag_descriptions::kEnableUseZoomForDsfDescription, kOsAll,
1987 MULTI_VALUE_TYPE(kEnableUseZoomForDSFChoices)}, 1971 MULTI_VALUE_TYPE(kEnableUseZoomForDSFChoices)},
1988 #if defined(OS_MACOSX) 1972 #if defined(OS_MACOSX)
1989 {"enable-harfbuzz-rendertext", flag_descriptions::kHarfbuzzRendertextName, 1973 {"enable-harfbuzz-rendertext", flag_descriptions::kHarfbuzzRendertextName,
1990 flag_descriptions::kHarfbuzzRendertextDescription, kOsMac, 1974 flag_descriptions::kHarfbuzzRendertextDescription, kOsMac,
1991 SINGLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText)}, 1975 SINGLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText)},
1992 #endif // OS_MACOSX 1976 #endif // OS_MACOSX
1993 {"data-reduction-proxy-lo-fi", 1977 {"data-reduction-proxy-lo-fi",
1994 flag_descriptions::kDataReductionProxyLoFiName, 1978 flag_descriptions::kDataReductionProxyLoFiName,
(...skipping 1451 matching lines...) Expand 10 before | Expand all | Expand 10 after
3446 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 3430 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
3447 3431
3448 const FeatureEntry* GetFeatureEntries(size_t* count) { 3432 const FeatureEntry* GetFeatureEntries(size_t* count) {
3449 *count = arraysize(kFeatureEntries); 3433 *count = arraysize(kFeatureEntries);
3450 return kFeatureEntries; 3434 return kFeatureEntries;
3451 } 3435 }
3452 3436
3453 } // namespace testing 3437 } // namespace testing
3454 3438
3455 } // namespace about_flags 3439 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698