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

chrome/browser/views/frame/browser_view_layout.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_view_layout.h"
 
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
@@ skipping 240 matching lines @@
       break;
   }
 }
 
 void BrowserViewLayout::Layout(views::View* host) {
   vertical_layout_rect_ = browser_view_->GetLocalBounds(true);
   LayoutExtensionAppIconAndTitle();
   int top = LayoutTabStrip();
   if (browser_view_->IsTabStripVisible() && !browser_view_->UseVerticalTabs()) {
     tabstrip_->SetBackgroundOffset(gfx::Point(
-        tabstrip_->x() - browser_view_->GetToolbarBounds().x(),
-        tabstrip_->y()));
+        tabstrip_->MirroredX() + browser_view_->MirroredX(),
+        browser_view_->frame()->GetHorizontalTabStripVerticalOffset(false)));
   }
   top = LayoutToolbar(top);
   top = LayoutBookmarkAndInfoBars(top);
   int bottom = LayoutExtensionAndDownloadShelves();
   LayoutTabContents(top, bottom);
   // This must be done _after_ we lay out the TabContents since this
   // code calls back into us to find the bounding box the find bar
   // must be laid out within, and that code depends on the
   // TabContentsContainer's bounds being up to date.
   if (browser()->HasFindBarController()) {
@@ skipping 179 matching lines @@
     bottom -= height;
   }
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser()->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
       (infobar_container_->GetPreferredSize().height() != 0);
 }