summaryrefslogtreecommitdiffstats
path: root/ash/monitor/monitor_controller.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-27 23:33:48 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-27 23:33:48 +0000
commit3f6ffb8f5a4a78d63a53526c220e74a500fa8eba (patch)
treed07b13f007134878d268db46087f80c19dd8c088 /ash/monitor/monitor_controller.cc
parent084d97a144cba94376a578190839aa96ddb7d78c (diff)
downloadchromium_src-3f6ffb8f5a4a78d63a53526c220e74a500fa8eba.zip
chromium_src-3f6ffb8f5a4a78d63a53526c220e74a500fa8eba.tar.gz
chromium_src-3f6ffb8f5a4a78d63a53526c220e74a500fa8eba.tar.bz2
This change makes Aura/Views to use DIP, while keeping layer to use Pixels. This allow chrome/ash to run on high density screen in High Density Incompatible mode (everything scaled to 2x), except for web contents.
I put this behind ENABLE_DIP to avoid regression. I'll make it runtime flag next week when we get render working. BUG=114666 TEST=manual: run with --aura-host-window-size=1000x800*2. Review URL: https://chromiumcodereview.appspot.com/10081011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/monitor/monitor_controller.cc')
-rw-r--r--ash/monitor/monitor_controller.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/monitor/monitor_controller.cc b/ash/monitor/monitor_controller.cc
index 145fa67..486fde2 100644
--- a/ash/monitor/monitor_controller.cc
+++ b/ash/monitor/monitor_controller.cc
@@ -54,13 +54,13 @@ MonitorController::~MonitorController() {
}
void MonitorController::OnMonitorBoundsChanged(const gfx::Monitor& monitor) {
- root_windows_[monitor.id()]->SetHostBounds(monitor.bounds());
+ root_windows_[monitor.id()]->SetHostBounds(monitor.bounds_in_pixel());
}
void MonitorController::OnMonitorAdded(const gfx::Monitor& monitor) {
if (root_windows_.empty()) {
root_windows_[monitor.id()] = Shell::GetRootWindow();
- Shell::GetRootWindow()->SetHostBounds(monitor.bounds());
+ Shell::GetRootWindow()->SetHostBounds(monitor.bounds_in_pixel());
return;
}
aura::RootWindow* root = aura::Env::GetInstance()->monitor_manager()->
@@ -90,7 +90,7 @@ void MonitorController::Init() {
if (i == 0) {
// Primary monitor
root_windows_[monitor.id()] = Shell::GetRootWindow();
- Shell::GetRootWindow()->SetHostBounds(monitor.bounds());
+ Shell::GetRootWindow()->SetHostBounds(monitor.bounds_in_pixel());
} else {
aura::RootWindow* root =
monitor_manager->CreateRootWindowForMonitor(monitor);