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

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

Issue 247193002: Remove touch layout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 const Experiment::Choice kTouchEventsChoices[] = { 157 const Experiment::Choice kTouchEventsChoices[] = {
158 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" }, 158 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" },
159 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 159 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
160 switches::kTouchEvents, 160 switches::kTouchEvents,
161 switches::kTouchEventsEnabled }, 161 switches::kTouchEventsEnabled },
162 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 162 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
163 switches::kTouchEvents, 163 switches::kTouchEvents,
164 switches::kTouchEventsDisabled } 164 switches::kTouchEventsDisabled }
165 }; 165 };
166 166
167 const Experiment::Choice kTouchOptimizedUIChoices[] = {
168 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" },
169 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
170 switches::kTouchOptimizedUI,
171 switches::kTouchOptimizedUIEnabled },
172 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
173 switches::kTouchOptimizedUI,
174 switches::kTouchOptimizedUIDisabled }
175 };
176
177 #if defined(USE_AURA) 167 #if defined(USE_AURA)
178 const Experiment::Choice kOverscrollHistoryNavigationChoices[] = { 168 const Experiment::Choice kOverscrollHistoryNavigationChoices[] = {
179 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, 169 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" },
180 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 170 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
181 switches::kOverscrollHistoryNavigation, 171 switches::kOverscrollHistoryNavigation,
182 "0" }, 172 "0" },
183 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, 173 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI,
184 switches::kOverscrollHistoryNavigation, 174 switches::kOverscrollHistoryNavigation,
185 "2" } 175 "2" }
186 }; 176 };
(...skipping 700 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction) 877 SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)
888 }, 878 },
889 { 879 {
890 "touch-events", 880 "touch-events",
891 IDS_TOUCH_EVENTS_NAME, 881 IDS_TOUCH_EVENTS_NAME,
892 IDS_TOUCH_EVENTS_DESCRIPTION, 882 IDS_TOUCH_EVENTS_DESCRIPTION,
893 kOsDesktop, 883 kOsDesktop,
894 MULTI_VALUE_TYPE(kTouchEventsChoices) 884 MULTI_VALUE_TYPE(kTouchEventsChoices)
895 }, 885 },
896 { 886 {
897 "touch-optimized-ui",
898 IDS_FLAGS_TOUCH_OPTIMIZED_UI_NAME,
899 IDS_FLAGS_TOUCH_OPTIMIZED_UI_DESCRIPTION,
900 kOsWin,
901 MULTI_VALUE_TYPE(kTouchOptimizedUIChoices)
902 },
903 {
904 "disable-touch-adjustment", 887 "disable-touch-adjustment",
905 IDS_DISABLE_TOUCH_ADJUSTMENT_NAME, 888 IDS_DISABLE_TOUCH_ADJUSTMENT_NAME,
906 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, 889 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION,
907 kOsWin | kOsLinux | kOsCrOS, 890 kOsWin | kOsLinux | kOsCrOS,
908 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) 891 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment)
909 }, 892 },
910 #if defined(OS_CHROMEOS) 893 #if defined(OS_CHROMEOS)
911 { 894 {
912 "ash-disable-docked-windows", 895 "ash-disable-docked-windows",
913 IDS_FLAGS_DOCKED_WINDOWS_NAME, 896 IDS_FLAGS_DOCKED_WINDOWS_NAME,
(...skipping 1389 matching lines...) Expand 10 before | Expand all | Expand 10 after
2303 } 2286 }
2304 2287
2305 const Experiment* GetExperiments(size_t* count) { 2288 const Experiment* GetExperiments(size_t* count) {
2306 *count = num_experiments; 2289 *count = num_experiments;
2307 return experiments; 2290 return experiments;
2308 } 2291 }
2309 2292
2310 } // namespace testing 2293 } // namespace testing
2311 2294
2312 } // namespace about_flags 2295 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698