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

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

Issue 2854403003: MD Settings: Add feature flag for showing content settings in a per-origin view. (Closed)
Patch Set: Fix histogram entry? Created 3 years, 7 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 | chrome/browser/flag_descriptions.h » ('j') | chrome/browser/flag_descriptions.cc » ('J')
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 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after
1199 flag_descriptions::kEnableAndroidSpellcheckerDescription, 1199 flag_descriptions::kEnableAndroidSpellcheckerDescription,
1200 flag_descriptions::kEnableAndroidSpellcheckerDescription, kOsAndroid, 1200 flag_descriptions::kEnableAndroidSpellcheckerDescription, kOsAndroid,
1201 FEATURE_VALUE_TYPE(spellcheck::kAndroidSpellCheckerNonLowEnd)}, 1201 FEATURE_VALUE_TYPE(spellcheck::kAndroidSpellCheckerNonLowEnd)},
1202 #endif // ENABLE_SPELLCHECK && OS_ANDROID 1202 #endif // ENABLE_SPELLCHECK && OS_ANDROID
1203 {"enable-scroll-prediction", flag_descriptions::kScrollPredictionName, 1203 {"enable-scroll-prediction", flag_descriptions::kScrollPredictionName,
1204 flag_descriptions::kScrollPredictionDescription, kOsDesktop, 1204 flag_descriptions::kScrollPredictionDescription, kOsDesktop,
1205 SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)}, 1205 SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)},
1206 {"top-chrome-md", flag_descriptions::kTopChromeMd, 1206 {"top-chrome-md", flag_descriptions::kTopChromeMd,
1207 flag_descriptions::kTopChromeMdDescription, kOsDesktop, 1207 flag_descriptions::kTopChromeMdDescription, kOsDesktop,
1208 MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)}, 1208 MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)},
1209 {"enable-site-details", flag_descriptions::kSiteDetails,
1210 flag_descriptions::kSiteDetailsDescription, kOsDesktop,
1211 SINGLE_VALUE_TYPE(switches::kEnableSiteDetails)},
1209 {"enable-site-settings", flag_descriptions::kSiteSettings, 1212 {"enable-site-settings", flag_descriptions::kSiteSettings,
1210 flag_descriptions::kSiteSettingsDescription, kOsDesktop, 1213 flag_descriptions::kSiteSettingsDescription, kOsDesktop,
1211 SINGLE_VALUE_TYPE(switches::kEnableSiteSettings)}, 1214 SINGLE_VALUE_TYPE(switches::kEnableSiteSettings)},
1212 {"secondary-ui-md", flag_descriptions::kSecondaryUiMd, 1215 {"secondary-ui-md", flag_descriptions::kSecondaryUiMd,
1213 flag_descriptions::kSecondaryUiMdDescription, kOsDesktop, 1216 flag_descriptions::kSecondaryUiMdDescription, kOsDesktop,
1214 SINGLE_VALUE_TYPE(switches::kExtendMdToSecondaryUi)}, 1217 SINGLE_VALUE_TYPE(switches::kExtendMdToSecondaryUi)},
1215 {"touch-events", flag_descriptions::kTouchEventsName, 1218 {"touch-events", flag_descriptions::kTouchEventsName,
1216 flag_descriptions::kTouchEventsDescription, kOsDesktop, 1219 flag_descriptions::kTouchEventsDescription, kOsDesktop,
1217 MULTI_VALUE_TYPE(kTouchEventFeatureDetectionChoices)}, 1220 MULTI_VALUE_TYPE(kTouchEventFeatureDetectionChoices)},
1218 {"disable-touch-adjustment", flag_descriptions::kTouchAdjustmentName, 1221 {"disable-touch-adjustment", flag_descriptions::kTouchAdjustmentName,
(...skipping 1827 matching lines...) Expand 10 before | Expand all | Expand 10 after
3046 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 3049 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
3047 3050
3048 const FeatureEntry* GetFeatureEntries(size_t* count) { 3051 const FeatureEntry* GetFeatureEntries(size_t* count) {
3049 *count = arraysize(kFeatureEntries); 3052 *count = arraysize(kFeatureEntries);
3050 return kFeatureEntries; 3053 return kFeatureEntries;
3051 } 3054 }
3052 3055
3053 } // namespace testing 3056 } // namespace testing
3054 3057
3055 } // namespace about_flags 3058 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/flag_descriptions.h » ('j') | chrome/browser/flag_descriptions.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698