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

Unified Diff: ui/views/widget/native_widget_aura.cc

Issue 211733003: Move GetCursor() method from WindowDelegate to its own delegate interface CursorDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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
« no previous file with comments | « ui/views/widget/native_widget_aura.h ('k') | ui/wm/core/compound_event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_aura.cc
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index 4463e6a1d30d58ed3da2fa7f7def392b0fdcaceb..5b102b253e37a4ab3e6d68a063524930ac4391c4 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -80,6 +80,7 @@ NativeWidgetAura::NativeWidgetAura(internal::NativeWidgetDelegate* delegate)
saved_window_state_(ui::SHOW_STATE_DEFAULT) {
aura::client::SetFocusChangeObserver(window_, this);
aura::client::SetActivationChangeObserver(window_, this);
+ wm::SetCursorDelegate(window_, this);
}
// static
@@ -725,10 +726,6 @@ void NativeWidgetAura::OnBoundsChanged(const gfx::Rect& old_bounds,
delegate_->OnNativeWidgetSizeChanged(new_bounds.size());
}
-gfx::NativeCursor NativeWidgetAura::GetCursor(const gfx::Point& point) {
- return cursor_;
-}
-
int NativeWidgetAura::GetNonClientComponent(const gfx::Point& point) const {
return delegate_->GetNonClientComponent(point);
}
@@ -948,6 +945,13 @@ int NativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) {
}
////////////////////////////////////////////////////////////////////////////////
+// NativeWidgetAura, wm::CursorDelegate implementation:
+
+gfx::NativeCursor NativeWidgetAura::GetCursorForPoint(const gfx::Point& point) {
+ return cursor_;
+}
+
+////////////////////////////////////////////////////////////////////////////////
// NativeWidgetAura, NativeWidget implementation:
ui::EventHandler* NativeWidgetAura::GetEventHandler() {
« no previous file with comments | « ui/views/widget/native_widget_aura.h ('k') | ui/wm/core/compound_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698