| OLD | NEW |
| 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 810 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 821 {"enable-android-spellchecker", IDS_OPTIONS_ENABLE_SPELLCHECK, | 821 {"enable-android-spellchecker", IDS_OPTIONS_ENABLE_SPELLCHECK, |
| 822 IDS_OPTIONS_ENABLE_ANDROID_SPELLCHECKER_DESCRIPTION, kOsAndroid, | 822 IDS_OPTIONS_ENABLE_ANDROID_SPELLCHECKER_DESCRIPTION, kOsAndroid, |
| 823 FEATURE_VALUE_TYPE(spellcheck::kAndroidSpellChecker)}, | 823 FEATURE_VALUE_TYPE(spellcheck::kAndroidSpellChecker)}, |
| 824 #endif // ENABLE_SPELLCHECK) && defined(OS_ANDROID | 824 #endif // ENABLE_SPELLCHECK) && defined(OS_ANDROID |
| 825 {"enable-scroll-prediction", IDS_FLAGS_SCROLL_PREDICTION_NAME, | 825 {"enable-scroll-prediction", IDS_FLAGS_SCROLL_PREDICTION_NAME, |
| 826 IDS_FLAGS_SCROLL_PREDICTION_DESCRIPTION, kOsDesktop, | 826 IDS_FLAGS_SCROLL_PREDICTION_DESCRIPTION, kOsDesktop, |
| 827 SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)}, | 827 SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)}, |
| 828 {"top-chrome-md", IDS_FLAGS_TOP_CHROME_MD, | 828 {"top-chrome-md", IDS_FLAGS_TOP_CHROME_MD, |
| 829 IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION, kOsDesktop, | 829 IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION, kOsDesktop, |
| 830 MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)}, | 830 MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)}, |
| 831 {"enable-site-settings", IDS_FLAGS_SITE_SETTINGS, |
| 832 IDS_FLAGS_SITE_SETTINGS_DESCRIPTION, kOsDesktop, |
| 833 SINGLE_VALUE_TYPE(switches::kEnableSiteSettings)}, |
| 831 {"secondary-ui-md", IDS_FLAGS_SECONDARY_UI_MD, | 834 {"secondary-ui-md", IDS_FLAGS_SECONDARY_UI_MD, |
| 832 IDS_FLAGS_SECONDARY_UI_MD_DESCRIPTION, kOsDesktop, | 835 IDS_FLAGS_SECONDARY_UI_MD_DESCRIPTION, kOsDesktop, |
| 833 SINGLE_VALUE_TYPE(switches::kExtendMdToSecondaryUi)}, | 836 SINGLE_VALUE_TYPE(switches::kExtendMdToSecondaryUi)}, |
| 834 {"touch-events", IDS_FLAGS_TOUCH_EVENTS_NAME, | 837 {"touch-events", IDS_FLAGS_TOUCH_EVENTS_NAME, |
| 835 IDS_FLAGS_TOUCH_EVENTS_DESCRIPTION, kOsDesktop, | 838 IDS_FLAGS_TOUCH_EVENTS_DESCRIPTION, kOsDesktop, |
| 836 MULTI_VALUE_TYPE(kTouchEventsChoices)}, | 839 MULTI_VALUE_TYPE(kTouchEventsChoices)}, |
| 837 {"disable-touch-adjustment", IDS_FLAGS_TOUCH_ADJUSTMENT_NAME, | 840 {"disable-touch-adjustment", IDS_FLAGS_TOUCH_ADJUSTMENT_NAME, |
| 838 IDS_FLAGS_TOUCH_ADJUSTMENT_DESCRIPTION, | 841 IDS_FLAGS_TOUCH_ADJUSTMENT_DESCRIPTION, |
| 839 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, | 842 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| 840 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)}, | 843 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)}, |
| (...skipping 1403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2244 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2247 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2245 | 2248 |
| 2246 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2249 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2247 *count = arraysize(kFeatureEntries); | 2250 *count = arraysize(kFeatureEntries); |
| 2248 return kFeatureEntries; | 2251 return kFeatureEntries; |
| 2249 } | 2252 } |
| 2250 | 2253 |
| 2251 } // namespace testing | 2254 } // namespace testing |
| 2252 | 2255 |
| 2253 } // namespace about_flags | 2256 } // namespace about_flags |
| OLD | NEW |