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

Unified Diff: ui/gfx/monitor.cc

Issue 10260033: Build fixes to get use_aura && !use_ash to build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/monitor.cc
===================================================================
--- ui/gfx/monitor.cc (revision 134705)
+++ ui/gfx/monitor.cc (working copy)
@@ -50,7 +50,7 @@
bounds_(bounds),
work_area_(bounds),
device_scale_factor_(GetDefaultDeviceScaleFactor()) {
-#if defined(USE_ASH)
+#if defined(USE_AURA)
SetScaleAndBounds(device_scale_factor_, bounds);
#endif
}
@@ -63,7 +63,7 @@
const gfx::Rect& bounds_in_pixel) {
Insets insets = bounds_.InsetsFrom(work_area_);
device_scale_factor_ = device_scale_factor;
-#if defined(USE_ASH)
+#if defined(USE_AURA)
bounds_in_pixel_ = bounds_in_pixel;
#endif
// TODO(oshima): For m19, work area/monitor bounds that chrome/webapps sees
@@ -81,7 +81,7 @@
void Monitor::SetSize(const gfx::Size& size_in_pixel) {
SetScaleAndBounds(
device_scale_factor_,
-#if defined(USE_ASH)
+#if defined(USE_AURA)
gfx::Rect(bounds_in_pixel_.origin(), size_in_pixel));
#else
gfx::Rect(bounds_.origin(), size_in_pixel));
« no previous file with comments | « ui/gfx/monitor.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698