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

chrome/browser/views/frame/opaque_non_client_view.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/frame/opaque_non_client_view.h"
 
 #include "chrome/app/theme/theme_resources.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/gfx/path.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/root_view.h"
 #include "chrome/views/window_resources.h"
 #include "chromium_strings.h"
@@ skipping 483 matching lines @@
 
 CPoint OpaqueNonClientView::GetSystemMenuPoint() const {
   // TODO(pkasting): This is wrong; Windows native runs the menu at the bottom
   // of the titlebar, not the bottom of the window icon.
   CPoint system_menu_point(icon_bounds_.x(), icon_bounds_.bottom());
   MapWindowPoints(frame_->GetHWND(), HWND_DESKTOP, &system_menu_point, 1);
   return system_menu_point;
 }
 
 int OpaqueNonClientView::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 = frame_->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;
   if (restore_button_->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(
       point))
     return HTMAXBUTTON;
   if (maximize_button_->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(
       point))
     return HTMAXBUTTON;
   if (minimize_button_->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(
       point))
     return HTMINBUTTON;
   if (window_icon_ &&
       window_icon_->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(point))
     return HTSYSMENU;
 
   int window_component = GetHTComponentForFrame(point, TopResizeHeight(),
-      NonClientBorderThickness(), kResizeAreaCornerSize,
+      NonClientBorderThickness(), kResizeAreaCornerSize, kResizeAreaCornerSize,
       frame_->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 OpaqueNonClientView::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 40 matching lines @@
 }
 
 void OpaqueNonClientView::Layout() {
   LayoutWindowControls();
   LayoutDistributorLogo();
   LayoutTitleBar();
   LayoutOTRAvatar();
   LayoutClientView();
 }
 
-gfx::Size OpaqueNonClientView::GetPreferredSize() {
-  gfx::Size prefsize(frame_->client_view()->GetPreferredSize());
-  int border_thickness = NonClientBorderThickness();
-  prefsize.Enlarge(2 * border_thickness,
-                   NonClientTopBorderHeight() + border_thickness);
-  return prefsize;
-}
-
 views::View* OpaqueNonClientView::GetViewForPoint(const gfx::Point& point,
                                                   bool can_create_floating) {
   // We override this function because the ClientView can overlap the non -
   // client view, making it impossible to click on the window controls. We need
   // to ensure the window controls are checked _first_.
   views::View* views[] =
       { close_button_, restore_button_, maximize_button_, minimize_button_ };
   for (int i = 0; i < arraysize(views); ++i) {
     if (!views[i]->IsVisible())
       continue;
@@ skipping 465 matching lines @@
 }
 
 // static
 void OpaqueNonClientView::InitAppWindowResources() {
   static bool initialized = false;
   if (!initialized) {
     title_font_ = win_util::GetWindowTitleFont();
     initialized = true;
   }
 }