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

chrome/browser/views/frame/browser_frame_win.h

Index: chrome/browser/views/frame/browser_frame_win.h
===================================================================
--- chrome/browser/views/frame/browser_frame_win.h	(revision 56738)
+++ chrome/browser/views/frame/browser_frame_win.h	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -35,13 +35,11 @@
 
   BrowserView* browser_view() const { return browser_view_; }
 
-  // Returns the height of the title bar.
-  int GetTitleBarHeight();
-
   // BrowserFrame implementation.
   virtual views::Window* GetWindow();
   virtual int GetMinimizeButtonOffset() const;
   virtual gfx::Rect GetBoundsForTabStrip(BaseTabStrip* tabstrip) const;
+  virtual int GetHorizontalTabStripVerticalOffset(bool restored) const;
   virtual void UpdateThrobber(bool running);
   virtual void ContinueDraggingDetachedTab();
   virtual ThemeProvider* GetThemeProviderForFrame() const;