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

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

Issue 2409003002: [MD settings] flag to enable site settings All sites and Site details pages (Closed)
Patch Set: merge with master; fix typo Created 4 years, 2 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 798 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 {"enable-android-spellchecker", IDS_OPTIONS_ENABLE_SPELLCHECK, 809 {"enable-android-spellchecker", IDS_OPTIONS_ENABLE_SPELLCHECK,
810 IDS_OPTIONS_ENABLE_ANDROID_SPELLCHECKER_DESCRIPTION, kOsAndroid, 810 IDS_OPTIONS_ENABLE_ANDROID_SPELLCHECKER_DESCRIPTION, kOsAndroid,
811 FEATURE_VALUE_TYPE(spellcheck::kAndroidSpellChecker)}, 811 FEATURE_VALUE_TYPE(spellcheck::kAndroidSpellChecker)},
812 #endif // ENABLE_SPELLCHECK) && defined(OS_ANDROID 812 #endif // ENABLE_SPELLCHECK) && defined(OS_ANDROID
813 {"enable-scroll-prediction", IDS_FLAGS_SCROLL_PREDICTION_NAME, 813 {"enable-scroll-prediction", IDS_FLAGS_SCROLL_PREDICTION_NAME,
814 IDS_FLAGS_SCROLL_PREDICTION_DESCRIPTION, kOsDesktop, 814 IDS_FLAGS_SCROLL_PREDICTION_DESCRIPTION, kOsDesktop,
815 SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)}, 815 SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)},
816 {"top-chrome-md", IDS_FLAGS_TOP_CHROME_MD, 816 {"top-chrome-md", IDS_FLAGS_TOP_CHROME_MD,
817 IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION, kOsDesktop, 817 IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION, kOsDesktop,
818 MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)}, 818 MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)},
819 {"enable-site-settings", IDS_FLAGS_SITE_SETTINGS,
820 IDS_FLAGS_SITE_SETTINGS_DESCRIPTION, kOsDesktop,
821 SINGLE_VALUE_TYPE(switches::kEnableSiteSettings)},
819 {"secondary-ui-md", IDS_FLAGS_SECONDARY_UI_MD, 822 {"secondary-ui-md", IDS_FLAGS_SECONDARY_UI_MD,
820 IDS_FLAGS_SECONDARY_UI_MD_DESCRIPTION, kOsDesktop, 823 IDS_FLAGS_SECONDARY_UI_MD_DESCRIPTION, kOsDesktop,
821 SINGLE_VALUE_TYPE(switches::kExtendMdToSecondaryUi)}, 824 SINGLE_VALUE_TYPE(switches::kExtendMdToSecondaryUi)},
822 {"touch-events", IDS_FLAGS_TOUCH_EVENTS_NAME, 825 {"touch-events", IDS_FLAGS_TOUCH_EVENTS_NAME,
823 IDS_FLAGS_TOUCH_EVENTS_DESCRIPTION, kOsDesktop, 826 IDS_FLAGS_TOUCH_EVENTS_DESCRIPTION, kOsDesktop,
824 MULTI_VALUE_TYPE(kTouchEventsChoices)}, 827 MULTI_VALUE_TYPE(kTouchEventsChoices)},
825 {"disable-touch-adjustment", IDS_FLAGS_TOUCH_ADJUSTMENT_NAME, 828 {"disable-touch-adjustment", IDS_FLAGS_TOUCH_ADJUSTMENT_NAME,
826 IDS_FLAGS_TOUCH_ADJUSTMENT_DESCRIPTION, 829 IDS_FLAGS_TOUCH_ADJUSTMENT_DESCRIPTION,
827 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, 830 kOsWin | kOsLinux | kOsCrOS | kOsAndroid,
828 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)}, 831 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)},
(...skipping 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after
2233 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2236 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2234 2237
2235 const FeatureEntry* GetFeatureEntries(size_t* count) { 2238 const FeatureEntry* GetFeatureEntries(size_t* count) {
2236 *count = arraysize(kFeatureEntries); 2239 *count = arraysize(kFeatureEntries);
2237 return kFeatureEntries; 2240 return kFeatureEntries;
2238 } 2241 }
2239 2242
2240 } // namespace testing 2243 } // namespace testing
2241 2244
2242 } // namespace about_flags 2245 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/settings/settings_shared_css.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698