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

Unified Diff: ui/gfx/monitor.cc

Issue 10221028: Move DIP translation from ui/aura to ui/compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: disable tests that doesn't run on bots Created 8 years, 7 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 | « ui/gfx/monitor.h ('k') | ui/gfx/monitor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/monitor.cc
diff --git a/ui/gfx/monitor.cc b/ui/gfx/monitor.cc
index 5783a92babe08ef15f8a3d52832d613c3bb1f082..36dde848a6c5e5bb5a76adf60cc5caec74244898 100644
--- a/ui/gfx/monitor.cc
+++ b/ui/gfx/monitor.cc
@@ -69,12 +69,8 @@ void Monitor::SetScaleAndBounds(
// TODO(oshima): For m19, work area/monitor bounds that chrome/webapps sees
// has (0, 0) origin because it's simpler and enough. Fix this when
// real multi monitor support is implemented.
-#if defined(ENABLE_DIP)
bounds_ = gfx::Rect(
bounds_in_pixel.size().Scale(1.0f / device_scale_factor_));
-#else
- bounds_ = gfx::Rect(bounds_in_pixel.size());
-#endif
UpdateWorkAreaFromInsets(insets);
}
« no previous file with comments | « ui/gfx/monitor.h ('k') | ui/gfx/monitor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698