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

ui/views/controls/native/native_view_host_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/controls/native/native_view_host_aura.h"
 
 #include "base/logging.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/view_constants_aura.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/public/cursor_delegate.h"
 
 namespace views {
 
 NativeViewHostAura::NativeViewHostAura(NativeViewHost* host)
     : host_(host),
       installed_clip_(false) {
 }
 
 NativeViewHostAura::~NativeViewHostAura() {
   if (host_->native_view()) {
@@ skipping 71 matching lines @@
   aura::client::FocusClient* client = aura::client::GetFocusClient(window);
   if (client)
     client->FocusWindow(window);
 }
 
 gfx::NativeViewAccessible NativeViewHostAura::GetNativeViewAccessible() {
   return NULL;
 }
 
 gfx::NativeCursor NativeViewHostAura::GetCursor(int x, int y) {
-  if (host_->native_view())
-    return host_->native_view()->GetCursor(gfx::Point(x, y));
+  if (host_->native_view()) {
+    wm::CursorDelegate* delegate = wm::GetCursorDelegate(host_->native_view());
+    if (delegate)
+      return delegate->GetCursorForPoint(gfx::Point(x, y));
+  }
   return gfx::kNullCursor;
 }
 
 void NativeViewHostAura::OnWindowDestroyed(aura::Window* window) {
   DCHECK(window == host_->native_view());
   host_->NativeViewDestroyed();
 }
 
 // static
 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
     NativeViewHost* host) {
   return new NativeViewHostAura(host);
 }
 
 }  // namespace views