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

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

Issue 2467913002: Touch event flag should control only DOM event firing. (Closed)
Patch Set: Bring the auto back. 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 using flags_ui::kOsCrOSOwnerOnly; 126 using flags_ui::kOsCrOSOwnerOnly;
127 127
128 namespace about_flags { 128 namespace about_flags {
129 129
130 namespace { 130 namespace {
131 131
132 const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid; 132 const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid;
133 const unsigned kOsDesktop = kOsMac | kOsWin | kOsLinux | kOsCrOS; 133 const unsigned kOsDesktop = kOsMac | kOsWin | kOsLinux | kOsCrOS;
134 134
135 const FeatureEntry::Choice kTouchEventsChoices[] = { 135 const FeatureEntry::Choice kTouchEventsChoices[] = {
136 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" }, 136 {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", ""},
mustaq 2016/11/16 14:54:16 The formatting here seems different from all other
sunyunjia 2016/11/16 16:39:58 Done.
137 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 137 {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kTouchEvents,
138 switches::kTouchEvents, 138 switches::kTouchEventsDisabled},
139 switches::kTouchEventsEnabled }, 139 {IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, switches::kTouchEvents,
140 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 140 switches::kTouchEventsAuto}};
141 switches::kTouchEvents,
142 switches::kTouchEventsDisabled }
143 };
144 141
145 #if defined(USE_AURA) 142 #if defined(USE_AURA)
146 const FeatureEntry::Choice kOverscrollHistoryNavigationChoices[] = { 143 const FeatureEntry::Choice kOverscrollHistoryNavigationChoices[] = {
147 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, 144 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" },
148 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 145 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
149 switches::kOverscrollHistoryNavigation, 146 switches::kOverscrollHistoryNavigation,
150 "0" }, 147 "0" },
151 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, 148 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI,
152 switches::kOverscrollHistoryNavigation, 149 switches::kOverscrollHistoryNavigation,
153 "2" } 150 "2" }
(...skipping 2165 matching lines...) Expand 10 before | Expand all | Expand 10 after
2319 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2316 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2320 2317
2321 const FeatureEntry* GetFeatureEntries(size_t* count) { 2318 const FeatureEntry* GetFeatureEntries(size_t* count) {
2322 *count = arraysize(kFeatureEntries); 2319 *count = arraysize(kFeatureEntries);
2323 return kFeatureEntries; 2320 return kFeatureEntries;
2324 } 2321 }
2325 2322
2326 } // namespace testing 2323 } // namespace testing
2327 2324
2328 } // namespace about_flags 2325 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698