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

chrome/browser/views/frame/browser_frame_gtk.h

-// Copyright (c) 2009 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_GTK_H_
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_GTK_H_
 
 #include "base/basictypes.h"
 #include "chrome/browser/views/frame/browser_frame.h"
 #include "views/window/window_gtk.h"
 
@@ skipping 11 matching lines @@
   // Creates a frame view and initializes the window.  This
   // initialization function must be called after construction, it is
   // separate to avoid recursive calling of the frame from its
   // constructor.
   virtual void Init();
 
   // Overridden from BrowserFrame:
   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();
 
   // Overridden from views::Widget:
   virtual ThemeProvider* GetThemeProvider() const;
   virtual ThemeProvider* GetDefaultThemeProvider() const;
@@ skipping 31 matching lines @@
   // a copy as a BrowserRootView to avoid evil casting later, when we need to
   // call functions that only exist on BrowserRootView (versus RootView).
   BrowserRootView* root_view_;
 
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserFrameGtk);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_GTK_H_