diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 17:35:01 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 17:35:01 +0000 |
commit | 4bd2020359df676ca25c85c092bea06f7bd66bca (patch) | |
tree | 65d8ea2d5140715f9a846bbdac30f30a85e56a9a /chrome | |
parent | e36090400221119c85b2a7146a9ba0edeedf1f3d (diff) | |
download | chromium_src-4bd2020359df676ca25c85c092bea06f7bd66bca.zip chromium_src-4bd2020359df676ca25c85c092bea06f7bd66bca.tar.gz chromium_src-4bd2020359df676ca25c85c092bea06f7bd66bca.tar.bz2 |
Remove --default-device-scale-factor because chrome now gets scale factor from device.
Add --force-device-scale-factor instead to override it.
Remove obsolete comment in resource bundle.
BUG=none
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/10546158
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142163 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/about_flags.cc | 4 | ||||
-rw-r--r-- | chrome/browser/chromeos/login/login_utils.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index b99c819..203b27e 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -713,11 +713,11 @@ const Experiment kExperiments[] = { SINGLE_VALUE_TYPE(switches::kEnableStackedTabStrip) }, { - "default-device-scale-factor", + "force-device-scale-factor", IDS_FLAGS_FORCE_HIGH_DPI_NAME, IDS_FLAGS_FORCE_HIGH_DPI_DESCRIPTION, kOsCrOS, - SINGLE_VALUE_TYPE_AND_VALUE(switches::kDefaultDeviceScaleFactor, "2") + SINGLE_VALUE_TYPE_AND_VALUE(switches::kForceDeviceScaleFactor, "2") }, #if defined(OS_CHROMEOS) { diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index 3ad6342..e40e173 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -712,7 +712,7 @@ std::string LoginUtilsImpl::GetOffTheRecordCommandLine( static const char* kForwardSwitches[] = { ::switches::kCompressSystemFeedback, ::switches::kDeviceManagementUrl, - ::switches::kDefaultDeviceScaleFactor, + ::switches::kForceDeviceScaleFactor, ::switches::kDisableAccelerated2dCanvas, ::switches::kDisableAcceleratedPlugins, ::switches::kDisableGpuWatchdog, |