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

Unified Diff: chrome/browser/ui/window_sizer/window_sizer.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix some new gfx::Screen additions Created 8 years, 2 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
Index: chrome/browser/ui/window_sizer/window_sizer.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc
index 57d0426147fed45c8d9cf955010bb3284c397fbb..6084e481e5ec9e4fa5892a2874b187b6300e0793 100644
--- a/chrome/browser/ui/window_sizer/window_sizer.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer.cc
@@ -27,14 +27,18 @@ class DefaultMonitorInfoProvider : public MonitorInfoProvider {
public:
// Overridden from MonitorInfoProvider:
virtual gfx::Rect GetPrimaryDisplayWorkArea() const OVERRIDE {
- return gfx::Screen::GetPrimaryDisplay().work_area();
+ // TODO(scottmg): NativeScreen is wrong. http://crbug.com/133312
+ return gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().work_area();
}
virtual gfx::Rect GetPrimaryDisplayBounds() const OVERRIDE {
- return gfx::Screen::GetPrimaryDisplay().bounds();
+ // TODO(scottmg): NativeScreen is wrong. http://crbug.com/133312
+ return gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().bounds();
}
virtual gfx::Rect GetMonitorWorkAreaMatching(
const gfx::Rect& match_rect) const OVERRIDE {
- return gfx::Screen::GetDisplayMatching(match_rect).work_area();
+ // TODO(scottmg): NativeScreen is wrong. http://crbug.com/133312
+ return gfx::Screen::GetNativeScreen()->GetDisplayMatching(
+ match_rect).work_area();
}
oshima 2012/10/10 17:58:23 Looks like passing native window (or screen) from
scottmg 2012/10/10 19:04:47 Done.
};

Powered by Google App Engine
This is Rietveld 408576698