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

ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index f7f835b0df57cfa3685df70cfcc96e71b32a89b7..e619661efa63c444714b97c15e8dcfdca1ede312 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -259,7 +259,6 @@
       widget_type_(Widget::InitParams::TYPE_WINDOW) {
   aura::client::SetFocusChangeObserver(content_window_, this);
   aura::client::SetActivationChangeObserver(content_window_, this);
-  wm::SetCursorDelegate(content_window_, this);
 }
 
 DesktopNativeWidgetAura::~DesktopNativeWidgetAura() {
@@ -930,6 +929,10 @@
   return native_widget_delegate_->GetMaximumSize();
 }
 
+gfx::NativeCursor DesktopNativeWidgetAura::GetCursor(const gfx::Point& point) {
+  return cursor_;
+}
+
 int DesktopNativeWidgetAura::GetNonClientComponent(
     const gfx::Point& point) const {
   return native_widget_delegate_->GetNonClientComponent(point);
@@ -1160,14 +1163,6 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// DesktopNativeWidgetAura, wm::CursorDelegate implementation:
-
-gfx::NativeCursor DesktopNativeWidgetAura::GetCursorForPoint(
-    const gfx::Point& point) {
-  return cursor_;
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, NativeWidget implementation:
 
 ui::EventHandler* DesktopNativeWidgetAura::GetEventHandler() {