Revert of Move GetCursor() method from WindowDelegate to its own delegate interface CursorDelegate. (https://codereview.chromium.org/211733003/)

Reason for revert:
http://crbug.com/357015

Original issue's description:
> Move GetCursor() method from WindowDelegate to its own delegate interface CursorDelegate.
> 
> R=sky@chromium.org
> http://crbug.com/308845
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=259631

TBR=sky@chromium.org
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/213383007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259805 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 1 insertions, 65 deletions

diff --git a/ui/wm/core/compound_event_filter.cc b/ui/wm/core/compound_event_filter.cc
index 6efafea..edb7146 100644
--- a/ui/wm/core/compound_event_filter.cc
+++ b/ui/wm/core/compound_event_filter.cc
@@ -15,7 +15,6 @@
 #include "ui/base/hit_test.h"
 #include "ui/events/event.h"
 #include "ui/wm/public/activation_client.h"
-#include "ui/wm/public/cursor_delegate.h"
 #include "ui/wm/public/drag_drop_client.h"
 
 #if defined(OS_CHROMEOS) && defined(USE_X11)
@@ -159,9 +158,7 @@ void CompoundEventFilter::UpdateCursor(aura::Window* target,
   aura::client::CursorClient* cursor_client =
       aura::client::GetCursorClient(root_window);
   if (cursor_client) {
-    CursorDelegate* delegate = GetCursorDelegate(target);
-    gfx::NativeCursor cursor = delegate ?
-        delegate->GetCursorForPoint(event->location()) : gfx::kNullCursor;
+    gfx::NativeCursor cursor = target->GetCursor(event->location());
     if ((event->flags() & ui::EF_IS_NON_CLIENT)) {
       if (target->delegate()) {
         int window_component =
diff --git a/ui/wm/public/cursor_delegate.cc b/ui/wm/public/cursor_delegate.cc
deleted file mode 100644
index bea259d..0000000
--- a/ui/wm/public/cursor_delegate.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2014 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/wm/public/cursor_delegate.h"
-
-#include "ui/aura/window.h"
-#include "ui/aura/window_property.h"
-
-DECLARE_WINDOW_PROPERTY_TYPE(wm::CursorDelegate*);
-
-namespace wm {
-
-DEFINE_LOCAL_WINDOW_PROPERTY_KEY(CursorDelegate*, kCursorDelegateKey, NULL);
-
-void SetCursorDelegate(aura::Window* window, CursorDelegate* delegate) {
-  window->SetProperty(kCursorDelegateKey, delegate);
-}
-
-CursorDelegate* GetCursorDelegate(aura::Window* window) {
-  return window ? window->GetProperty(kCursorDelegateKey) : NULL;
-}
-
-}  // namespace wm
diff --git a/ui/wm/public/cursor_delegate.h b/ui/wm/public/cursor_delegate.h
deleted file mode 100644
index 1acf4d7..0000000
--- a/ui/wm/public/cursor_delegate.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef UI_WM_PUBLIC_CURSOR_DELEGATE_H_
-#define UI_WM_PUBLIC_CURSOR_DELEGATE_H_
-
-#include "ui/gfx/native_widget_types.h"
-#include "ui/wm/core/wm_core_export.h"
-
-namespace aura {
-class Window;
-}
-
-namespace gfx {
-class Point;
-}
-
-namespace wm {
-
-class WM_CORE_EXPORT CursorDelegate {
- public:
-  virtual gfx::NativeCursor GetCursorForPoint(const gfx::Point& point) = 0;
-
- protected:
-  virtual ~CursorDelegate() {}
-};
-
-WM_CORE_EXPORT void SetCursorDelegate(aura::Window* window,
-                                      CursorDelegate* delegate);
-WM_CORE_EXPORT CursorDelegate* GetCursorDelegate(aura::Window* window);
-
-}  // namespace wm
-
-#endif  // UI_WM_PUBLIC_CURSOR_DELEGATE_H_
diff --git a/ui/wm/wm.gyp b/ui/wm/wm.gyp
index cccadc0..a1960ec 100644
--- a/ui/wm/wm.gyp
+++ b/ui/wm/wm.gyp
@@ -85,8 +85,6 @@
         'core/wm_core_switches.h',
         'core/wm_state.cc',
         'core/wm_state.h',
-        'public/cursor_delegate.cc',
-        'public/cursor_delegate.h',
       ],
     },
     {