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

chrome/browser/views/frame/app_panel_browser_frame_view.h

 // 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_APP_PANEL_BROWSER_FRAME_VIEW_H_
 #define CHROME_BROWSER_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_
 
 #include "chrome/browser/views/frame/browser_frame.h"
 #include "chrome/browser/views/frame/browser_non_client_frame_view.h"
 #include "chrome/browser/views/tab_icon_view.h"
@@ skipping 16 matching lines @@
 class AppPanelBrowserFrameView : public BrowserNonClientFrameView,
                                  public views::ButtonListener,
                                  public TabIconView::TabIconViewModel {
  public:
   // Constructs a non-client view for an BrowserFrame.
   AppPanelBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view);
   virtual ~AppPanelBrowserFrameView();
 
   // Overridden from BrowserNonClientFrameView:
   virtual gfx::Rect GetBoundsForTabStrip(BaseTabStrip* tabstrip) const;
+  virtual int GetHorizontalTabStripVerticalOffset(bool restored) const;
   virtual void UpdateThrobber(bool running);
   virtual gfx::Size GetMinimumSize();
 
  protected:
   // Overridden from views::NonClientFrameView:
   virtual gfx::Rect GetBoundsForClientView() const;
   virtual bool AlwaysUseCustomFrame() const;
   virtual bool AlwaysUseNativeFrame() const;
   virtual gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const;
@@ skipping 72 matching lines @@
   // The accessible name of this view.
   std::wstring accessible_name_;
 
   static void InitAppWindowResources();
   static gfx::Font* title_font_;
 
   DISALLOW_COPY_AND_ASSIGN(AppPanelBrowserFrameView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_