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

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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 const Experiment::Choice kTouchEventsChoices[] = { 158 const Experiment::Choice kTouchEventsChoices[] = {
159 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" }, 159 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" },
160 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 160 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
161 switches::kTouchEvents, 161 switches::kTouchEvents,
162 switches::kTouchEventsEnabled }, 162 switches::kTouchEventsEnabled },
163 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 163 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
164 switches::kTouchEvents, 164 switches::kTouchEvents,
165 switches::kTouchEventsDisabled } 165 switches::kTouchEventsDisabled }
166 }; 166 };
167 167
168 const Experiment::Choice kTouchOptimizedUIChoices[] = {
169 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" },
170 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
171 switches::kTouchOptimizedUI,
172 switches::kTouchOptimizedUIEnabled },
173 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
174 switches::kTouchOptimizedUI,
175 switches::kTouchOptimizedUIDisabled }
176 };
177
178 #if defined(USE_AURA) 168 #if defined(USE_AURA)
179 const Experiment::Choice kOverscrollHistoryNavigationChoices[] = { 169 const Experiment::Choice kOverscrollHistoryNavigationChoices[] = {
180 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, 170 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" },
181 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 171 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
182 switches::kOverscrollHistoryNavigation, 172 switches::kOverscrollHistoryNavigation,
183 "0" }, 173 "0" },
184 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, 174 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI,
185 switches::kOverscrollHistoryNavigation, 175 switches::kOverscrollHistoryNavigation,
186 "2" } 176 "2" }
187 }; 177 };
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction) 888 SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)
899 }, 889 },
900 { 890 {
901 "touch-events", 891 "touch-events",
902 IDS_TOUCH_EVENTS_NAME, 892 IDS_TOUCH_EVENTS_NAME,
903 IDS_TOUCH_EVENTS_DESCRIPTION, 893 IDS_TOUCH_EVENTS_DESCRIPTION,
904 kOsDesktop, 894 kOsDesktop,
905 MULTI_VALUE_TYPE(kTouchEventsChoices) 895 MULTI_VALUE_TYPE(kTouchEventsChoices)
906 }, 896 },
907 { 897 {
908 "touch-optimized-ui",
909 IDS_FLAGS_TOUCH_OPTIMIZED_UI_NAME,
910 IDS_FLAGS_TOUCH_OPTIMIZED_UI_DESCRIPTION,
911 kOsWin,
912 MULTI_VALUE_TYPE(kTouchOptimizedUIChoices)
913 },
914 {
915 "disable-touch-adjustment", 898 "disable-touch-adjustment",
916 IDS_DISABLE_TOUCH_ADJUSTMENT_NAME, 899 IDS_DISABLE_TOUCH_ADJUSTMENT_NAME,
917 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION, 900 IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION,
918 kOsWin | kOsLinux | kOsCrOS, 901 kOsWin | kOsLinux | kOsCrOS,
919 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment) 902 SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment)
920 }, 903 },
921 #if defined(OS_CHROMEOS) 904 #if defined(OS_CHROMEOS)
922 { 905 {
923 "ash-disable-docked-windows", 906 "ash-disable-docked-windows",
924 IDS_FLAGS_DOCKED_WINDOWS_NAME, 907 IDS_FLAGS_DOCKED_WINDOWS_NAME,
(...skipping 1388 matching lines...) Expand 10 before | Expand all | Expand 10 after
2313 } 2296 }
2314 2297
2315 const Experiment* GetExperiments(size_t* count) { 2298 const Experiment* GetExperiments(size_t* count) {
2316 *count = num_experiments; 2299 *count = num_experiments;
2317 return experiments; 2300 return experiments;
2318 } 2301 }
2319 2302
2320 } // namespace testing 2303 } // namespace testing
2321 2304
2322 } // namespace about_flags 2305 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698