Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Unified Diff: ui/views/window/non_client_view.h

Issue 380813003: Remove remaining overrides of View::HitTestRect() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase against ToT Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/window/non_client_view.h
diff --git a/ui/views/window/non_client_view.h b/ui/views/window/non_client_view.h
index 77181426418d18963c2f477782299695fd98b26b..3400662895ec6d7fc976d2deb9207e61ad763ef4 100644
--- a/ui/views/window/non_client_view.h
+++ b/ui/views/window/non_client_view.h
@@ -6,6 +6,7 @@
#define UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
#include "ui/views/view.h"
+#include "ui/views/view_targeter_delegate.h"
namespace gfx {
class Path;
@@ -22,7 +23,8 @@ class ClientView;
// responds to events within the frame portions of the non-client area of a
// window. This view does _not_ contain the ClientView, but rather is a sibling
// of it.
-class VIEWS_EXPORT NonClientFrameView : public View {
+class VIEWS_EXPORT NonClientFrameView : public View,
+ public ViewTargeterDelegate {
public:
// Internal class name.
static const char kViewClassName[];
@@ -78,11 +80,14 @@ class VIEWS_EXPORT NonClientFrameView : public View {
virtual void UpdateWindowIcon() = 0;
virtual void UpdateWindowTitle() = 0;
- // Overridden from View:
- virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
+ // View:
virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
virtual const char* GetClassName() const OVERRIDE;
+ // ViewTargeterDelegate:
+ virtual bool DoesIntersectRect(const View* target,
+ const gfx::Rect& rect) const OVERRIDE;
+
protected:
virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698