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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index a1d3a56a8e87c6d6eb82b2bb92ccaec66f6be38c..b6c9a8684f01e516946aee8d6781f82923de4c00 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -178,17 +178,6 @@ const Experiment::Choice kOverscrollHistoryNavigationChoices[] = {
"2" }
};
#endif
-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
-const Experiment::Choice kDeviceScaleFactorChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
- { IDS_DEVICE_SCALE_FACTOR_1_1, switches::kForceDeviceScaleFactor, "1.1"},
- { IDS_DEVICE_SCALE_FACTOR_1_2, switches::kForceDeviceScaleFactor, "1.2"},
- { IDS_DEVICE_SCALE_FACTOR_1_25, switches::kForceDeviceScaleFactor, "1.25"},
- { IDS_DEVICE_SCALE_FACTOR_1_3, switches::kForceDeviceScaleFactor, "1.3"},
- { IDS_DEVICE_SCALE_FACTOR_1_4, switches::kForceDeviceScaleFactor, "1.4"},
- { IDS_DEVICE_SCALE_FACTOR_2, switches::kForceDeviceScaleFactor, "2"},
-};
-#endif
#if !defined(DISABLE_NACL)
const Experiment::Choice kNaClDebugMaskChoices[] = {
@@ -921,15 +910,6 @@ const Experiment kExperiments[] = {
SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")
},
#endif
-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
- {
- "force-device-scale-factor",
- IDS_FLAGS_FORCE_DEVICE_SCALE_FACTOR_NAME,
- IDS_FLAGS_FORCE_DEVICE_SCALE_FACTOR_DESCRIPTION,
- kOsLinux | kOsWin | kOsCrOS,
- MULTI_VALUE_TYPE(kDeviceScaleFactorChoices)
- },
-#endif
#if defined(OS_CHROMEOS)
{
"allow-touchpad-three-finger-click",
« 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