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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/monitor.h

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 | « content/content_tests.gypi ('k') | ui/gfx/monitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/monitor.h
===================================================================
--- ui/gfx/monitor.h (revision 134705)
+++ ui/gfx/monitor.h (working copy)
@@ -69,7 +69,7 @@
// |work_area_insets| and the bounds.
void UpdateWorkAreaFromInsets(const gfx::Insets& work_area_insets);
-#if defined(USE_ASH)
+#if defined(USE_AURA)
// TODO(oshima): |bounds()| on ash is not screen's coordinate and
// this is an workaround for this. This will be removed when ash
// has true multi monitor support. crbug.com/119268.
@@ -84,7 +84,7 @@
int id_;
Rect bounds_;
Rect work_area_;
-#if defined(USE_ASH)
+#if defined(USE_AURA)
Rect bounds_in_pixel_;
#endif
float device_scale_factor_;
« no previous file with comments | « content/content_tests.gypi ('k') | ui/gfx/monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698