Fix regression where the window caption buttons weren't clickable when maximized. This is because of the nonclient frameview/clientview hierarchy changes.

Make sure that the frame gets a chance to respond to GetViewForPoint before the client view if the client view does not visually overlap.

http://crbug.com/8312

Review URL: http://codereview.chromium.org/40062

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

1 files changed, 7 insertions, 1 deletions

diff --git a/chrome/views/non_client_view.h b/chrome/views/non_client_view.h
index f801d6f..32130c3 100644
--- a/chrome/views/non_client_view.h
+++ b/chrome/views/non_client_view.h
@@ -22,7 +22,7 @@ namespace views {
 //  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 NonClientFrameView : public views::View {
+class NonClientFrameView : public View {
  public:
   // Various edges of the frame border have a 1 px shadow along their edges; in
   // a few cases we shift elements based on this amount for visual appeal.
@@ -55,6 +55,9 @@ class NonClientFrameView : public views::View {
   virtual void EnableClose(bool enable) = 0;
   virtual void ResetWindowControls() = 0;
 
+  // Overridden from View:
+  virtual bool HitTest(const gfx::Point& l) const;
+
  protected:
   NonClientFrameView() : paint_as_active_(false) {}
 
@@ -191,6 +194,9 @@ class NonClientView : public View {
  protected:
   // NonClientView, View overrides:
   virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
+  virtual views::View* GetViewForPoint(const gfx::Point& point);
+  virtual views::View* GetViewForPoint(const gfx::Point& point,
+                                       bool can_create_floating);
 
  private:
   // The frame that hosts this NonClientView.