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

Unified Diff: ui/views/mus/screen_mus.cc

Issue 1881253002: mus: Implement ScreenMus::GetCursorScreenPoint(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Actually apply the 32bit patch now that the delegate crash was fixed. Created 4 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
Index: ui/views/mus/screen_mus.cc
diff --git a/ui/views/mus/screen_mus.cc b/ui/views/mus/screen_mus.cc
index cec007bfe6b5adf9bc2690578c776462dc9e37fb..75ada15d3d8b2408c28a49775736e9f9f64a5419 100644
--- a/ui/views/mus/screen_mus.cc
+++ b/ui/views/mus/screen_mus.cc
@@ -80,7 +80,8 @@ namespace views {
ScreenMus::ScreenMus(ScreenMusDelegate* delegate)
: delegate_(delegate),
primary_display_index_(0),
- display_manager_observer_binding_(this) {}
+ display_manager_observer_binding_(this) {
+}
ScreenMus::~ScreenMus() {}
@@ -159,8 +160,13 @@ void ScreenMus::ProcessDisplayChanged(const gfx::Display& changed_display,
}
gfx::Point ScreenMus::GetCursorScreenPoint() {
- NOTIMPLEMENTED();
- return gfx::Point();
+ if (!delegate_) {
+ // TODO(erg): If we need the cursor point in the window manager, we'll need
+ // to make |delegate_| required. It only recently changed to be optional.
+ NOTIMPLEMENTED();
+ return gfx::Point();
+ }
+ return delegate_->GetCursorScreenPoint();
}
gfx::NativeWindow ScreenMus::GetWindowUnderCursor() {

Powered by Google App Engine
This is Rietveld 408576698