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

Unified Diff: ui/gfx/screen_android.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 other os's 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: ui/gfx/screen_android.cc
diff --git a/ui/gfx/screen_android.cc b/ui/gfx/screen_android.cc
index a2e5a5ddb7aec36dbb0e8095c2749c095f6f29ac..5ca7c5939a9bd1ef1d53915aa0a33ad5b256d6dd 100644
--- a/ui/gfx/screen_android.cc
+++ b/ui/gfx/screen_android.cc
@@ -15,22 +15,23 @@ bool Screen::IsDIPEnabled() {
}
// static
-gfx::Display Screen::GetPrimaryDisplay() {
+gfx::Display Screen::GetPrimaryDisplay(gfx::NativeView context) {
NOTIMPLEMENTED() << "crbug.com/117839 tracks implementation";
return gfx::Display(0, gfx::Rect(0, 0, 1, 1));
}
// static
gfx::Display Screen::GetDisplayNearestWindow(gfx::NativeView view) {
- return GetPrimaryDisplay();
+ return GetPrimaryDisplay(view);
}
// static
-gfx::Display Screen::GetDisplayNearestPoint(const gfx::Point& point) {
- return GetPrimaryDisplay();
+gfx::Display Screen::GetDisplayNearestPoint(
+ gfx::NativeView context, const gfx::Point& point) {
+ return GetPrimaryDisplay(context);
}
-int Screen::GetNumDisplays() {
+int Screen::GetNumDisplays(gfx::NativeView context) {
return 1;
}

Powered by Google App Engine
This is Rietveld 408576698