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

chrome/browser/views/frame/browser_frame_win.h

-// 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.
 
 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_WIN_H_
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_WIN_H_
 
 #include "base/basictypes.h"
 #include "chrome/browser/views/frame/browser_frame.h"
 #include "views/window/window_win.h"
 
@@ skipping 16 matching lines @@
   // Init must be called before using this class, which Create will do for you.
   BrowserFrameWin(BrowserView* browser_view, Profile* profile);
   virtual ~BrowserFrameWin();
 
   // This initialization function must be called after construction, it is
   // separate to avoid recursive calling of the frame from its constructor.
   void Init();
 
   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;
   virtual bool AlwaysUseNativeFrame() const;
   virtual views::View* GetFrameView() const;
   virtual void TabStripDisplayModeChanged();
 
  protected:
   // Overridden from views::WindowWin:
   virtual gfx::Insets GetClientAreaInsets() const;
@@ skipping 37 matching lines @@
   BrowserRootView* root_view_;
 
   bool frame_initialized_;
 
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserFrameWin);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_WIN_H_