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

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

Issue 580083004: Remove "device scale factor" option from about flags page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « chrome/app/generated_resources.grd ('k') | no next file » | 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 const Experiment::Choice kOverscrollHistoryNavigationChoices[] = { 171 const Experiment::Choice kOverscrollHistoryNavigationChoices[] = {
172 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, 172 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" },
173 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 173 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
174 switches::kOverscrollHistoryNavigation, 174 switches::kOverscrollHistoryNavigation,
175 "0" }, 175 "0" },
176 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, 176 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI,
177 switches::kOverscrollHistoryNavigation, 177 switches::kOverscrollHistoryNavigation,
178 "2" } 178 "2" }
179 }; 179 };
180 #endif 180 #endif
181 #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
182 const Experiment::Choice kDeviceScaleFactorChoices[] = {
183 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
184 { IDS_DEVICE_SCALE_FACTOR_1_1, switches::kForceDeviceScaleFactor, "1.1"},
185 { IDS_DEVICE_SCALE_FACTOR_1_2, switches::kForceDeviceScaleFactor, "1.2"},
186 { IDS_DEVICE_SCALE_FACTOR_1_25, switches::kForceDeviceScaleFactor, "1.25"},
187 { IDS_DEVICE_SCALE_FACTOR_1_3, switches::kForceDeviceScaleFactor, "1.3"},
188 { IDS_DEVICE_SCALE_FACTOR_1_4, switches::kForceDeviceScaleFactor, "1.4"},
189 { IDS_DEVICE_SCALE_FACTOR_2, switches::kForceDeviceScaleFactor, "2"},
190 };
191 #endif
192 181
193 #if !defined(DISABLE_NACL) 182 #if !defined(DISABLE_NACL)
194 const Experiment::Choice kNaClDebugMaskChoices[] = { 183 const Experiment::Choice kNaClDebugMaskChoices[] = {
195 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by 184 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by
196 // debug stub to a remote machine. Since secure shell uses NaCl, we usually 185 // debug stub to a remote machine. Since secure shell uses NaCl, we usually
197 // want to avoid debugging that. The PNaCl translator is also a NaCl module, 186 // want to avoid debugging that. The PNaCl translator is also a NaCl module,
198 // so by default we want to avoid debugging that. 187 // so by default we want to avoid debugging that.
199 // NOTE: As the default value must be the empty string, the mask excluding 188 // NOTE: As the default value must be the empty string, the mask excluding
200 // the PNaCl translator and secure shell is substituted elsewhere. 189 // the PNaCl translator and secure shell is substituted elsewhere.
201 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" }, 190 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" },
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after
914 }, 903 },
915 #if defined(ENABLE_PLUGINS) 904 #if defined(ENABLE_PLUGINS)
916 { 905 {
917 "allow-nacl-socket-api", 906 "allow-nacl-socket-api",
918 IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, 907 IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME,
919 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, 908 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION,
920 kOsDesktop, 909 kOsDesktop,
921 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*") 910 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")
922 }, 911 },
923 #endif 912 #endif
924 #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
925 {
926 "force-device-scale-factor",
927 IDS_FLAGS_FORCE_DEVICE_SCALE_FACTOR_NAME,
928 IDS_FLAGS_FORCE_DEVICE_SCALE_FACTOR_DESCRIPTION,
929 kOsLinux | kOsWin | kOsCrOS,
930 MULTI_VALUE_TYPE(kDeviceScaleFactorChoices)
931 },
932 #endif
933 #if defined(OS_CHROMEOS) 913 #if defined(OS_CHROMEOS)
934 { 914 {
935 "allow-touchpad-three-finger-click", 915 "allow-touchpad-three-finger-click",
936 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME, 916 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME,
937 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, 917 IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION,
938 kOsCrOS, 918 kOsCrOS,
939 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick) 919 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)
940 }, 920 },
941 { 921 {
942 "enable-easy-signin", 922 "enable-easy-signin",
(...skipping 1550 matching lines...) Expand 10 before | Expand all | Expand 10 after
2493 } 2473 }
2494 2474
2495 const Experiment* GetExperiments(size_t* count) { 2475 const Experiment* GetExperiments(size_t* count) {
2496 *count = num_experiments; 2476 *count = num_experiments;
2497 return experiments; 2477 return experiments;
2498 } 2478 }
2499 2479
2500 } // namespace testing 2480 } // namespace testing
2501 2481
2502 } // namespace about_flags 2482 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698