Merge 56737 - Fix numerous alignment problems, both horizontal and vertical, ...

chrome/browser/views/frame/browser_frame_win.cc

 // Copyright (c) 2010 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/browser_frame_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include <set>
@@ skipping 51 matching lines @@
   set_focus_on_creation(false);
 }
 
 void BrowserFrameWin::Init() {
   WindowWin::Init(NULL, gfx::Rect());
 }
 
 BrowserFrameWin::~BrowserFrameWin() {
 }
 
-int BrowserFrameWin::GetTitleBarHeight() {
-  RECT caption = { 0 };
-  if (DwmGetWindowAttribute(GetNativeView(), DWMWA_CAPTION_BUTTON_BOUNDS,
-                            &caption, sizeof(RECT)) == S_OK) {
-    return caption.bottom;
-  }
-  return GetSystemMetrics(SM_CYCAPTION);
-}
-
 views::Window* BrowserFrameWin::GetWindow() {
   return this;
 }
 
 int BrowserFrameWin::GetMinimizeButtonOffset() const {
   TITLEBARINFOEX titlebar_info;
   titlebar_info.cbSize = sizeof(TITLEBARINFOEX);
   SendMessage(GetNativeView(), WM_GETTITLEBARINFOEX, 0, (WPARAM)&titlebar_info);
 
   CPoint minimize_button_corner(titlebar_info.rgrect[2].left,
                                 titlebar_info.rgrect[2].top);
   MapWindowPoints(HWND_DESKTOP, GetNativeView(), &minimize_button_corner, 1);
 
   return minimize_button_corner.x;
 }
 
 gfx::Rect BrowserFrameWin::GetBoundsForTabStrip(BaseTabStrip* tabstrip) const {
   return browser_frame_view_->GetBoundsForTabStrip(tabstrip);
 }
 
+int BrowserFrameWin::GetHorizontalTabStripVerticalOffset(bool restored) const {
+  return browser_frame_view_->GetHorizontalTabStripVerticalOffset(restored);
+}
+
 void BrowserFrameWin::UpdateThrobber(bool running) {
   browser_frame_view_->UpdateThrobber(running);
 }
 
 void BrowserFrameWin::ContinueDraggingDetachedTab() {
   // Send the message directly, so that the window is positioned appropriately.
   SendMessage(GetNativeWindow(), WM_NCLBUTTONDOWN, HTCAPTION, MAKELPARAM(0, 0));
 }
 
 ThemeProvider* BrowserFrameWin::GetThemeProviderForFrame() const {
@@ skipping 208 matching lines @@
     // become semi-transparent over any glass area.
     if (!IsMaximized() && !IsFullscreen()) {
       margins.cxLeftWidth = kClientEdgeThickness + 1;
       margins.cxRightWidth = kClientEdgeThickness + 1;
       margins.cyBottomHeight = kClientEdgeThickness + 1;
       margins.cyTopHeight = kClientEdgeThickness + 1;
     }
     // In maximized mode, we only have a titlebar strip of glass, no side/bottom
     // borders.
     if (!browser_view_->IsFullscreen()) {
-      if (browser_view_->UseVerticalTabs()) {
-        margins.cyTopHeight = GetTitleBarHeight();
-      } else {
-        margins.cyTopHeight =
-            GetBoundsForTabStrip(browser_view_->tabstrip()).bottom() +
-            kDWMFrameTopOffset;
-      }
+      gfx::Rect tabstrip_bounds(
+          GetBoundsForTabStrip(browser_view_->tabstrip()));
+      margins.cyTopHeight = (browser_view_->UseVerticalTabs() ?
+          tabstrip_bounds.y() : tabstrip_bounds.bottom()) + kDWMFrameTopOffset;
     }
   } else {
     // For popup and app windows we want to use the default margins.
   }
   DwmExtendFrameIntoClientArea(GetNativeView(), &margins);
 }