Revert of Move GetCursor() method from WindowDelegate to its own delegate interface CursorDelegate.

ui/views/widget/native_widget_aura.cc

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 5b102b253e37a4ab3e6d68a063524930ac4391c4..4463e6a1d30d58ed3da2fa7f7def392b0fdcaceb 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -80,7 +80,6 @@
       saved_window_state_(ui::SHOW_STATE_DEFAULT) {
   aura::client::SetFocusChangeObserver(window_, this);
   aura::client::SetActivationChangeObserver(window_, this);
-  wm::SetCursorDelegate(window_, this);
 }
 
 // static
@@ -726,6 +725,10 @@
     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);
 }
@@ -945,13 +948,6 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// NativeWidgetAura, wm::CursorDelegate implementation:
-
-gfx::NativeCursor NativeWidgetAura::GetCursorForPoint(const gfx::Point& point) {
-  return cursor_;
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, NativeWidget implementation:
 
 ui::EventHandler* NativeWidgetAura::GetEventHandler() {