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

chrome/browser/views/frame/browser_frame_gtk.cc

 // 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.
 
 #include "chrome/browser/views/frame/browser_frame_gtk.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/status_bubble.h"
@@ skipping 30 matching lines @@
   }
   virtual void GetWindowMask(const gfx::Size& size,
                              gfx::Path* window_mask) {}
   virtual void EnableClose(bool enable) {}
   virtual void ResetWindowControls() {}
 
   // BrowserNonClientFrameView:
   virtual gfx::Rect GetBoundsForTabStrip(BaseTabStrip* tabstrip) const {
     return gfx::Rect(0, 0, width(), tabstrip->GetPreferredHeight());
   }
+  virtual int GetHorizontalTabStripVerticalOffset(bool restored) const {
+    return 0;
+  }
   virtual void UpdateThrobber(bool running) {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PopupNonClientFrameView);
 };
 
 }
 
 #if !defined(OS_CHROMEOS)
 // static (Factory method.)
@@ skipping 41 matching lines @@
 
 int BrowserFrameGtk::GetMinimizeButtonOffset() const {
   NOTIMPLEMENTED();
   return 0;
 }
 
 gfx::Rect BrowserFrameGtk::GetBoundsForTabStrip(BaseTabStrip* tabstrip) const {
   return browser_frame_view_->GetBoundsForTabStrip(tabstrip);
 }
 
+int BrowserFrameGtk::GetHorizontalTabStripVerticalOffset(bool restored) const {
+  return browser_frame_view_->GetHorizontalTabStripVerticalOffset(restored);
+}
+
 void BrowserFrameGtk::UpdateThrobber(bool running) {
   browser_frame_view_->UpdateThrobber(running);
 }
 
 void BrowserFrameGtk::ContinueDraggingDetachedTab() {
   NOTIMPLEMENTED();
 }
 
 ThemeProvider* BrowserFrameGtk::GetThemeProviderForFrame() const {
   // This is implemented for a different interface than GetThemeProvider is,
@@ skipping 54 matching lines @@
   if (was_full_screen != IsFullscreen())
     browser_view_->FullScreenStateChanged();
   return result;
 }
 
 gboolean BrowserFrameGtk::OnConfigureEvent(GtkWidget* widget,
                                            GdkEventConfigure* event) {
   browser_view_->WindowMoved();
   return views::WindowGtk::OnConfigureEvent(widget, event);
 }