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

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

Issue 2467913002: Touch event flag should control only DOM event firing. (Closed)
Patch Set: Cleaner and clearer code. Created 4 years, 1 month 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 using flags_ui::kOsCrOSOwnerOnly; 127 using flags_ui::kOsCrOSOwnerOnly;
128 128
129 namespace about_flags { 129 namespace about_flags {
130 130
131 namespace { 131 namespace {
132 132
133 const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid; 133 const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid;
134 const unsigned kOsDesktop = kOsMac | kOsWin | kOsLinux | kOsCrOS; 134 const unsigned kOsDesktop = kOsMac | kOsWin | kOsLinux | kOsCrOS;
135 135
136 const FeatureEntry::Choice kTouchEventsChoices[] = { 136 const FeatureEntry::Choice kTouchEventsChoices[] = {
137 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" }, 137 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" },
138 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 138 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kTouchEvents,
139 switches::kTouchEvents, 139 switches::kTouchEventsDisabled },
140 switches::kTouchEventsEnabled }, 140 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, switches::kTouchEvents,
141 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 141 switches::kTouchEventsAuto }
142 switches::kTouchEvents,
143 switches::kTouchEventsDisabled }
144 }; 142 };
145 143
146 #if defined(USE_AURA) 144 #if defined(USE_AURA)
147 const FeatureEntry::Choice kOverscrollHistoryNavigationChoices[] = { 145 const FeatureEntry::Choice kOverscrollHistoryNavigationChoices[] = {
148 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, 146 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" },
149 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 147 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
150 switches::kOverscrollHistoryNavigation, 148 switches::kOverscrollHistoryNavigation,
151 "0" }, 149 "0" },
152 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, 150 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI,
153 switches::kOverscrollHistoryNavigation, 151 switches::kOverscrollHistoryNavigation,
(...skipping 2160 matching lines...) Expand 10 before | Expand all | Expand 10 after
2314 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2312 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2315 2313
2316 const FeatureEntry* GetFeatureEntries(size_t* count) { 2314 const FeatureEntry* GetFeatureEntries(size_t* count) {
2317 *count = arraysize(kFeatureEntries); 2315 *count = arraysize(kFeatureEntries);
2318 return kFeatureEntries; 2316 return kFeatureEntries;
2319 } 2317 }
2320 2318
2321 } // namespace testing 2319 } // namespace testing
2322 2320
2323 } // namespace about_flags 2321 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698