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

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

Issue 2806263005: Convert the overlay scrollbar flag to use FeatureList (Closed)
Patch Set: move feature_list_ change to SetUpCommandLine Created 3 years, 8 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/renderer/autofill/form_classifier_browsertest.cc » ('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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 #include "printing/features/features.h" 90 #include "printing/features/features.h"
91 #include "services/device/public/cpp/device_features.h" 91 #include "services/device/public/cpp/device_features.h"
92 #include "ui/base/ui_base_switches.h" 92 #include "ui/base/ui_base_switches.h"
93 #include "ui/compositor/compositor_switches.h" 93 #include "ui/compositor/compositor_switches.h"
94 #include "ui/display/display_switches.h" 94 #include "ui/display/display_switches.h"
95 #include "ui/events/event_switches.h" 95 #include "ui/events/event_switches.h"
96 #include "ui/gfx/switches.h" 96 #include "ui/gfx/switches.h"
97 #include "ui/gl/gl_features.h" 97 #include "ui/gl/gl_features.h"
98 #include "ui/gl/gl_switches.h" 98 #include "ui/gl/gl_switches.h"
99 #include "ui/keyboard/keyboard_switches.h" 99 #include "ui/keyboard/keyboard_switches.h"
100 #include "ui/native_theme/native_theme_switches.h" 100 #include "ui/native_theme/native_theme_features.h"
101 #include "ui/views/views_switches.h" 101 #include "ui/views/views_switches.h"
102 102
103 #if defined(OS_ANDROID) 103 #if defined(OS_ANDROID)
104 #include "chrome/browser/android/chrome_feature_list.h" 104 #include "chrome/browser/android/chrome_feature_list.h"
105 #include "components/feature_engagement_tracker/public/feature_constants.h" 105 #include "components/feature_engagement_tracker/public/feature_constants.h"
106 #else // OS_ANDROID 106 #else // OS_ANDROID
107 #include "ui/message_center/message_center_switches.h" 107 #include "ui/message_center/message_center_switches.h"
108 #endif // OS_ANDROID 108 #endif // OS_ANDROID
109 109
110 #if defined(OS_CHROMEOS) 110 #if defined(OS_CHROMEOS)
(...skipping 961 matching lines...) Expand 10 before | Expand all | Expand 10 after
1072 flag_descriptions::kSmoothScrollingDescription, 1072 flag_descriptions::kSmoothScrollingDescription,
1073 // Mac has a separate implementation with its own setting to disable. 1073 // Mac has a separate implementation with its own setting to disable.
1074 kOsLinux | kOsCrOS | kOsWin | kOsAndroid, 1074 kOsLinux | kOsCrOS | kOsWin | kOsAndroid,
1075 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling, 1075 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling,
1076 switches::kDisableSmoothScrolling)}, 1076 switches::kDisableSmoothScrolling)},
1077 #if defined(USE_AURA) 1077 #if defined(USE_AURA)
1078 {"overlay-scrollbars", flag_descriptions::kOverlayScrollbarsName, 1078 {"overlay-scrollbars", flag_descriptions::kOverlayScrollbarsName,
1079 flag_descriptions::kOverlayScrollbarsDescription, 1079 flag_descriptions::kOverlayScrollbarsDescription,
1080 // Uses the system preference on Mac (a different implementation). 1080 // Uses the system preference on Mac (a different implementation).
1081 // On Android, this is always enabled. 1081 // On Android, this is always enabled.
1082 kOsAura, 1082 kOsAura, FEATURE_VALUE_TYPE(features::kOverlayScrollbar)},
1083 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOverlayScrollbar,
1084 switches::kDisableOverlayScrollbar)},
1085 #endif // USE_AURA 1083 #endif // USE_AURA
1086 { // See http://crbug.com/120416 for how to remove this flag. 1084 { // See http://crbug.com/120416 for how to remove this flag.
1087 "save-page-as-mhtml", flag_descriptions::kSavePageAsMhtmlName, 1085 "save-page-as-mhtml", flag_descriptions::kSavePageAsMhtmlName,
1088 flag_descriptions::kSavePageAsMhtmlDescription, kOsMac | kOsWin | kOsLinux, 1086 flag_descriptions::kSavePageAsMhtmlDescription, kOsMac | kOsWin | kOsLinux,
1089 SINGLE_VALUE_TYPE(switches::kSavePageAsMHTML)}, 1087 SINGLE_VALUE_TYPE(switches::kSavePageAsMHTML)},
1090 {"mhtml-generator-option", flag_descriptions::kMhtmlGeneratorOptionName, 1088 {"mhtml-generator-option", flag_descriptions::kMhtmlGeneratorOptionName,
1091 flag_descriptions::kMhtmlGeneratorOptionDescription, 1089 flag_descriptions::kMhtmlGeneratorOptionDescription,
1092 kOsMac | kOsWin | kOsLinux, 1090 kOsMac | kOsWin | kOsLinux,
1093 MULTI_VALUE_TYPE(kMHTMLGeneratorOptionChoices)}, 1091 MULTI_VALUE_TYPE(kMHTMLGeneratorOptionChoices)},
1094 {"enable-quic", flag_descriptions::kQuicName, 1092 {"enable-quic", flag_descriptions::kQuicName,
(...skipping 1869 matching lines...) Expand 10 before | Expand all | Expand 10 after
2964 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2962 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2965 2963
2966 const FeatureEntry* GetFeatureEntries(size_t* count) { 2964 const FeatureEntry* GetFeatureEntries(size_t* count) {
2967 *count = arraysize(kFeatureEntries); 2965 *count = arraysize(kFeatureEntries);
2968 return kFeatureEntries; 2966 return kFeatureEntries;
2969 } 2967 }
2970 2968
2971 } // namespace testing 2969 } // namespace testing
2972 2970
2973 } // namespace about_flags 2971 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/autofill/form_classifier_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698