Fix numerous alignment problems, both horizontal and vertical, in drawing the...

chrome/browser/views/frame/glass_browser_frame_view.h

Index: chrome/browser/views/frame/glass_browser_frame_view.h
===================================================================
--- chrome/browser/views/frame/glass_browser_frame_view.h	(revision 56452)
+++ chrome/browser/views/frame/glass_browser_frame_view.h	(working copy)
@@ -22,6 +22,7 @@
 
   // Overridden from BrowserNonClientFrameView:
   virtual gfx::Rect GetBoundsForTabStrip(BaseTabStrip* tabstrip) const;
+  virtual int GetHorizontalTabStripVerticalOffset(bool restored) const;
   virtual void UpdateThrobber(bool running);
 
   // Overridden from views::NonClientFrameView:
@@ -49,8 +50,11 @@
   int NonClientBorderThickness() const;
 
   // Returns the height of the entire nonclient top border, including the window
-  // frame, any title area, and any connected client edge.
-  int NonClientTopBorderHeight() const;
+  // frame, any title area, and any connected client edge.  If |restored| is
+  // true, acts as if the window is restored regardless of the real mode.  If
+  // |ignore_vertical_tabs| is true, acts as if vertical tabs are off regardless
+  // of the real state.
+  int NonClientTopBorderHeight(bool restored, bool ignore_vertical_tabs) const;
 
   // Paint various sub-components of this view.
   void PaintToolbarBackground(gfx::Canvas* canvas);
@@ -71,9 +75,6 @@
   // Displays the next throbber frame.
   void DisplayNextThrobberFrame();
 
-  // The layout rect of the distributor logo, if visible.
-  gfx::Rect logo_bounds_;
-
   // The layout rect of the OTR avatar icon, if visible.
   gfx::Rect otr_avatar_bounds_;