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

ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
@@ skipping 241 matching lines @@
       can_activate_(true),
       content_window_container_(NULL),
       content_window_(new aura::Window(this)),
       native_widget_delegate_(delegate),
       last_drop_operation_(ui::DragDropTypes::DRAG_NONE),
       restore_focus_on_activate_(false),
       cursor_(gfx::kNullCursor),
       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() {
   if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
     delete native_widget_delegate_;
   else
     CloseNow();
 }
 
 // static
@@ skipping 650 matching lines @@
 // DesktopNativeWidgetAura, aura::WindowDelegate implementation:
 
 gfx::Size DesktopNativeWidgetAura::GetMinimumSize() const {
   return native_widget_delegate_->GetMinimumSize();
 }
 
 gfx::Size DesktopNativeWidgetAura::GetMaximumSize() const {
   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);
 }
 
 bool DesktopNativeWidgetAura::ShouldDescendIntoChildForEventHandling(
       aura::Window* child,
       const gfx::Point& location) {
   views::WidgetDelegate* widget_delegate = GetWidget()->widget_delegate();
   return !widget_delegate ||
@@ skipping 210 matching lines @@
 
 void DesktopNativeWidgetAura::OnHostMoved(const aura::WindowTreeHost* host,
                                           const gfx::Point& new_origin) {
   TRACE_EVENT1("views", "DesktopNativeWidgetAura::OnHostMoved",
                "new_origin", new_origin.ToString());
 
   native_widget_delegate_->OnNativeWidgetMove();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// DesktopNativeWidgetAura, wm::CursorDelegate implementation:
-
-gfx::NativeCursor DesktopNativeWidgetAura::GetCursorForPoint(
-    const gfx::Point& point) {
-  return cursor_;
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, NativeWidget implementation:
 
 ui::EventHandler* DesktopNativeWidgetAura::GetEventHandler() {
   return this;
 }
 
 void DesktopNativeWidgetAura::InstallInputMethodEventFilter() {
   DCHECK(!input_method_event_filter_.get());
 
   input_method_event_filter_.reset(new wm::InputMethodEventFilter(
@@ skipping 17 matching lines @@
   if (cursor_reference_count_ == 0) {
     // We are the last DesktopNativeWidgetAura instance, and we are responsible
     // for cleaning up |cursor_manager_|.
     delete cursor_manager_;
     native_cursor_manager_ = NULL;
     cursor_manager_ = NULL;
   }
 }
 
 }  // namespace views