summaryrefslogtreecommitdiffstats
path: root/ui/wm/public
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-27 06:07:04 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-27 06:07:04 +0000
commit62c9f106125075e5c14a16f4ca050a105579dec9 (patch)
treecdfe9f43f43e7de2e2edbcb6cbee0a70bd55ef15 /ui/wm/public
parent51c3b307889ae0ebebb73409bd02b110db7ef99a (diff)
downloadchromium_src-62c9f106125075e5c14a16f4ca050a105579dec9.zip
chromium_src-62c9f106125075e5c14a16f4ca050a105579dec9.tar.gz
chromium_src-62c9f106125075e5c14a16f4ca050a105579dec9.tar.bz2
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
Diffstat (limited to 'ui/wm/public')
-rw-r--r--ui/wm/public/cursor_delegate.cc24
-rw-r--r--ui/wm/public/cursor_delegate.h35
2 files changed, 0 insertions, 59 deletions
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_