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

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: win fix 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 ba299daf4df930caafeac701f7c13eccd3a2cb92..790af665eacbcdef38dbe8a34bb2cf4a0efc5d9f 100644
--- a/chrome/browser/ui/window_sizer/window_sizer.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer.cc
@@ -25,14 +25,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();
}
};

Powered by Google App Engine
This is Rietveld 408576698