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

Unified Diff: ash/ui_controls_ash.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: ash/ui_controls_ash.cc
diff --git a/ash/ui_controls_ash.cc b/ash/ui_controls_ash.cc
index f2aba71303c98c5f9995eb7f1b2d42515b3ae8d7..4c5ccfc82cecaeddab82f1ad33610ea324fad50d 100644
--- a/ash/ui_controls_ash.cc
+++ b/ash/ui_controls_ash.cc
@@ -107,7 +107,7 @@ class UIControlsAsh : public ui_controls::UIControlsAura {
virtual bool SendMouseEvents(ui_controls::MouseButton type,
int state) OVERRIDE {
- gfx::Point p(gfx::Screen::GetCursorScreenPoint());
+ gfx::Point p(ash::Shell::GetAshScreen()->GetCursorScreenPoint());
ui_controls::UIControlsAura* ui_controls = GetUIControlsAt(&p);
return ui_controls && ui_controls->SendMouseEvents(type, state);
}
@@ -116,14 +116,14 @@ class UIControlsAsh : public ui_controls::UIControlsAura {
ui_controls::MouseButton type,
int state,
const base::Closure& closure) OVERRIDE {
- gfx::Point p(gfx::Screen::GetCursorScreenPoint());
+ gfx::Point p(ash::Shell::GetAshScreen()->GetCursorScreenPoint());
ui_controls::UIControlsAura* ui_controls = GetUIControlsAt(&p);
return ui_controls && ui_controls->SendMouseEventsNotifyWhenDone(
type, state, closure);
}
virtual bool SendMouseClick(ui_controls::MouseButton type) OVERRIDE {
- gfx::Point p(gfx::Screen::GetCursorScreenPoint());
+ gfx::Point p(ash::Shell::GetAshScreen()->GetCursorScreenPoint());
ui_controls::UIControlsAura* ui_controls = GetUIControlsAt(&p);
return ui_controls && ui_controls->SendMouseClick(type);
}

Powered by Google App Engine
This is Rietveld 408576698