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

chrome/browser/views/frame/aero_glass_frame.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/aero_glass_frame.h"
 
 #include <dwmapi.h>
 
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/frame/aero_glass_non_client_view.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/window_delegate.h"
 
 // static
 
-// The width of the client edge to the left and right of the window.
-static const int kClientEdgeWidth = 3;
-// The height of the client edge to the bottom of the window.
-static const int kClientEdgeHeight = 2;
+static const int kClientEdgeThickness = 3;
 
 HICON AeroGlassFrame::throbber_icons_[AeroGlassFrame::kThrobberIconCount];
 
 ///////////////////////////////////////////////////////////////////////////////
 // AeroGlassFrame, public:
 
 AeroGlassFrame::AeroGlassFrame(BrowserView* browser_view)
     : Window(browser_view),
       browser_view_(browser_view),
       frame_initialized_(false),
@@ skipping 11 matching lines @@
 
 void AeroGlassFrame::Init() {
   Window::Init(NULL, gfx::Rect());
 }
 
 int AeroGlassFrame::GetMinimizeButtonOffset() const {
   TITLEBARINFOEX titlebar_info;
   titlebar_info.cbSize = sizeof(TITLEBARINFOEX);
   SendMessage(GetHWND(), WM_GETTITLEBARINFOEX, 0, (WPARAM)&titlebar_info);
 
-  RECT wr;
-  GetWindowRect(&wr);
+  CPoint minimize_button_corner(titlebar_info.rgrect[2].left,
+                                titlebar_info.rgrect[2].top);
+  MapWindowPoints(HWND_DESKTOP, GetHWND(), &minimize_button_corner, 1);
 
-  return wr.right - titlebar_info.rgrect[2].left;
+  return minimize_button_corner.x;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // AeroGlassFrame, BrowserFrame implementation:
 
 gfx::Rect AeroGlassFrame::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) {
   RECT rect = client_bounds.ToRECT();
   AdjustWindowRectEx(&rect, window_style(), FALSE, window_ex_style());
   return gfx::Rect(rect);
@@ skipping 72 matching lines @@
 }
 
 LRESULT AeroGlassFrame::OnNCCalcSize(BOOL mode, LPARAM l_param) {
   if (!browser_view_->IsTabStripVisible() || !mode) {
     SetMsgHandled(FALSE);
     return 0;
   }
 
   NCCALCSIZE_PARAMS* params = reinterpret_cast<NCCALCSIZE_PARAMS*>(l_param);
   int border_thickness = GetSystemMetrics(SM_CXSIZEFRAME);
-  params->rgrc[0].left += (border_thickness - kClientEdgeWidth);
-  params->rgrc[0].right -= (border_thickness - kClientEdgeWidth);
-  params->rgrc[0].bottom -= (border_thickness - kClientEdgeHeight);
+  params->rgrc[0].left += (border_thickness - kClientEdgeThickness);
+  params->rgrc[0].right -= (border_thickness - kClientEdgeThickness);
+  params->rgrc[0].bottom -= (border_thickness - kClientEdgeThickness);
 
   UpdateDWMFrame();
 
   SetMsgHandled(TRUE);
   return 0;
 }
 
 LRESULT AeroGlassFrame::OnNCHitTest(const CPoint& pt) {
   LRESULT result;
   if (DwmDefWindowProc(GetHWND(), WM_NCHITTEST, 0, MAKELPARAM(pt.x, pt.y),
@@ skipping 11 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // AeroGlassFrame, private:
 
 void AeroGlassFrame::UpdateDWMFrame() {
   // Nothing to do yet.
   if (!client_view())
     return;
 
-  MARGINS margins = { kClientEdgeWidth + 1,
-                      kClientEdgeWidth + 1,
+  MARGINS margins = { kClientEdgeThickness + 1,
+                      kClientEdgeThickness + 1,
                       GetBoundsForTabStrip(browser_view_->tabstrip()).bottom(),
-                      kClientEdgeHeight + 1 };
+                      kClientEdgeThickness + 1 };
   // Note: we don't use DwmEnableBlurBehindWindow because any region not
   // included in the glass region is composited source over. This means
   // that anything drawn directly with GDI appears fully transparent.
   DwmExtendFrameIntoClientArea(GetHWND(), &margins);
 }
 
 AeroGlassNonClientView* AeroGlassFrame::GetAeroGlassNonClientView() const {
   // We can safely assume that this conversion is true.
   return static_cast<AeroGlassNonClientView*>(non_client_view_);
 }
@@ skipping 24 matching lines @@
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle &rb = ResourceBundle::GetSharedInstance();
     for (int i = 0; i < kThrobberIconCount; ++i) {
       throbber_icons_[i] = rb.LoadThemeIcon(IDR_THROBBER_01 + i);
       DCHECK(throbber_icons_[i]);
     }
     initialized = true;
   }
 }