diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 01:14:02 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 01:14:02 +0000 |
| commit | 2d2e6ccb6884a01287e9aa49b4bd1d4852be3031 (patch) | |
| tree | 82e8b834aac57283a6fe880cfe15a638d2611ad7 | |
| parent | 9a0173e3c83d854d509b2f1ee4740db673c7dadf (diff) | |
| download | chromium_src-2d2e6ccb6884a01287e9aa49b4bd1d4852be3031.zip chromium_src-2d2e6ccb6884a01287e9aa49b4bd1d4852be3031.tar.gz chromium_src-2d2e6ccb6884a01287e9aa49b4bd1d4852be3031.tar.bz2 | |
Add ability to turn off DIP
BUG=127420
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10386050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136210 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/aura/monitor_change_observer_x11.cc | 4 | ||||
| -rw-r--r-- | ui/compositor/dip_util.cc | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ui/aura/monitor_change_observer_x11.cc b/ui/aura/monitor_change_observer_x11.cc index 734f3e0..30b9981 100644 --- a/ui/aura/monitor_change_observer_x11.cc +++ b/ui/aura/monitor_change_observer_x11.cc @@ -15,6 +15,7 @@ #include "ui/aura/env.h" #include "ui/aura/dispatcher_linux.h" #include "ui/aura/monitor_manager.h" +#include "ui/compositor/dip_util.h" #include "ui/gfx/monitor.h" namespace aura { @@ -111,7 +112,8 @@ void MonitorChangeObserverX11::NotifyMonitorChange() { gfx::Rect(crtc_info->x, crtc_info->y, mode->width, mode->height))); float device_scale_factor = 1.0f; - if (output_info->mm_width > 0 && + if (ui::IsDIPEnabled() && + output_info->mm_width > 0 && (kInchInMm * mode->width / output_info->mm_width) > kHighDensityDIPThreshold) { device_scale_factor = 2.0f; diff --git a/ui/compositor/dip_util.cc b/ui/compositor/dip_util.cc index 6e9a98f..0fc3506 100644 --- a/ui/compositor/dip_util.cc +++ b/ui/compositor/dip_util.cc @@ -35,8 +35,9 @@ ScopedDIPEnablerForTest::~ScopedDIPEnablerForTest() { bool IsDIPEnabled() { const CommandLine& command_line = *CommandLine::ForCurrentProcess(); static const bool dip_enabled = - command_line.HasSwitch(switches::kUIEnableDIP) || - command_line.HasSwitch(switches::kDefaultDeviceScaleFactor); + command_line.HasSwitch(switches::kDefaultDeviceScaleFactor) || + (command_line.HasSwitch(switches::kUIEnableDIP) && + command_line.GetSwitchValueASCII(switches::kUIEnableDIP) != "false"); return dip_enabled || dip_enabled_for_test; } |