Make aero glass code look more like other nonclient views in hopes of easing ...

chrome/browser/views/constrained_window_impl.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/views/constrained_window_impl.h"
 
 #include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 181 matching lines @@
       public views::BaseButton::ButtonListener {
  public:
   ConstrainedWindowNonClientView(ConstrainedWindowImpl* container,
                                  TabContents* owner);
   virtual ~ConstrainedWindowNonClientView();
 
   void UpdateWindowTitle();
 
   // Overridden from views::NonClientView:
   virtual gfx::Rect CalculateClientAreaBounds(int width, int height) const;
-  virtual gfx::Size CalculateWindowSizeForClientSize(int width,
-                                                     int height) const;
   virtual CPoint GetSystemMenuPoint() const;
   virtual int NonClientHitTest(const gfx::Point& point);
   virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask);
   virtual void EnableClose(bool enable);
   virtual void ResetWindowControls() { }
 
   // Overridden from views::View:
   virtual void Paint(ChromeCanvas* canvas);
   virtual void Layout();
-  virtual gfx::Size GetPreferredSize();
   virtual void ViewHierarchyChanged(bool is_add, View *parent, View *child);
 
   // Overridden from views::BaseButton::ButtonListener:
   virtual void ButtonPressed(views::BaseButton* sender);
 
  private:
   // Returns the thickness of the border that makes up the window frame edges.
   // This does not include any client edge.
   int FrameBorderThickness() const;
 
@@ skipping 115 matching lines @@
 gfx::Rect ConstrainedWindowNonClientView::CalculateClientAreaBounds(
     int width,
     int height) const {
   int top_height = NonClientTopBorderHeight();
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(border_thickness, top_height,
                    std::max(0, width - (2 * border_thickness)),
                    std::max(0, height - top_height - border_thickness));
 }
 
-gfx::Size ConstrainedWindowNonClientView::CalculateWindowSizeForClientSize(
-    int width,
-    int height) const {
-  int border_thickness = NonClientBorderThickness();
-  return gfx::Size(width + (2 * border_thickness),
-                   height + NonClientTopBorderHeight() + border_thickness);
-}
-
 CPoint ConstrainedWindowNonClientView::GetSystemMenuPoint() const {
   // Doesn't matter what we return, since this is only used when the user clicks
   // a window icon, and we never have an icon.
   return CPoint();
 }
 
 int ConstrainedWindowNonClientView::NonClientHitTest(const gfx::Point& point) {
-  // First see if it's within the grow box area, since that overlaps the client
-  // bounds.
+  if (!bounds().Contains(point))
+    return HTNOWHERE;
+
   int frame_component = container_->client_view()->NonClientHitTest(point);
   if (frame_component != HTNOWHERE)
     return frame_component;
 
   // Then see if the point is within any of the window controls.
   if (close_button_->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(point))
     return HTCLOSE;
 
   int window_component = GetHTComponentForFrame(point, FrameBorderThickness(),
-      NonClientBorderThickness(), kResizeAreaCornerSize,
+      NonClientBorderThickness(), kResizeAreaCornerSize, kResizeAreaCornerSize,
       container_->window_delegate()->CanResize());
   // Fall back to the caption if no other component matches.
-  return ((window_component == HTNOWHERE) && bounds().Contains(point)) ?
-      HTCAPTION : window_component;
+  return (window_component == HTNOWHERE) ? HTCAPTION : window_component;
 }
 
 void ConstrainedWindowNonClientView::GetWindowMask(const gfx::Size& size,
                                                    gfx::Path* window_mask) {
   DCHECK(window_mask);
 
   // Redefine the window visible region for the new size.
   window_mask->moveTo(0, 3);
   window_mask->lineTo(1, 2);
   window_mask->lineTo(1, 1);
@@ skipping 24 matching lines @@
   PaintTitleBar(canvas);
   PaintClientEdge(canvas);
 }
 
 void ConstrainedWindowNonClientView::Layout() {
   LayoutWindowControls();
   LayoutTitleBar();
   LayoutClientView();
 }
 
-gfx::Size ConstrainedWindowNonClientView::GetPreferredSize() {
-  gfx::Size prefsize(container_->client_view()->GetPreferredSize());
-  int border_thickness = NonClientBorderThickness();
-  prefsize.Enlarge(2 * border_thickness,
-                   NonClientTopBorderHeight() + border_thickness);
-  return prefsize;
-}
-
 void ConstrainedWindowNonClientView::ViewHierarchyChanged(bool is_add,
                                                           View *parent,
                                                           View *child) {
   // Add our Client View as we are added to the Container so that if we are
   // subsequently resized all the parent-child relationships are established.
   if (is_add && GetWidget() && child == this)
     AddChildView(container_->client_view());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 304 matching lines @@
 ConstrainedWindow* ConstrainedWindow::CreateConstrainedDialog(
     TabContents* parent,
     const gfx::Rect& initial_bounds,
     views::View* contents_view,
     views::WindowDelegate* window_delegate) {
   ConstrainedWindowImpl* window = new ConstrainedWindowImpl(parent,
                                                             window_delegate);
   window->InitAsDialog(initial_bounds);
   return window;
 }