Pixel perfection on tabstrip for non-Aero frame. This gets both ends of the ...

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2006-2008 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 "base/command_line.h"
 
 #include "chrome/browser/views/frame/browser_view.h"
 
 #include "base/file_version_info.h"
 #include "base/time.h"
@@ skipping 751 matching lines @@
         SupportsWindowFeature(FEATURE_LOCATIONBAR)) {
       // If we're showing the toolbar, we need to adjust |*bounds| to include
       // its desired height, since the toolbar is considered part of the
       // window's client area as far as GetWindowBoundsForClientBounds is
       // concerned...
       bounds->set_height(
           bounds->height() + toolbar_->GetPreferredSize().height());
     }
 
     gfx::Rect window_rect = frame_->GetWindowBoundsForClientBounds(*bounds);
-    window_rect.set_origin(gfx::Point(bounds->x(), bounds->y()));
+    window_rect.set_origin(bounds->origin());
 
     // When we are given x/y coordinates of 0 on a created popup window,
     // assume none were given by the window.open() command.
     if (window_rect.x() == 0 && window_rect.y() == 0) {
-      gfx::Point origin = GetNormalBounds().origin();
-      origin.set_x(origin.x() + kWindowTilePixels);
-      origin.set_y(origin.y() + kWindowTilePixels);
-      window_rect.set_origin(origin);
+      window_rect.set_origin(GetNormalBounds().origin());
+      window_rect.Offset(kWindowTilePixels, kWindowTilePixels);
     }
 
     *bounds = window_rect;
   }
 
   // We return true because we can _always_ locate reasonable bounds using the
   // WindowSizer, and we don't want to trigger the Window's built-in "size to
   // default" handling because the browser window has no default preferred
   // size.
   return true;
@@ skipping 238 matching lines @@
   gfx::Point tab_strip_loc(event.location());
   ConvertPointToView(this, tabstrip_, &tab_strip_loc);
   return new views::DropTargetEvent(event.GetData(), tab_strip_loc.x(),
                                     tab_strip_loc.y(),
                                     event.GetSourceOperations());
 }
 
 int BrowserView::LayoutTabStrip() {
   if (IsTabStripVisible()) {
     gfx::Rect tabstrip_bounds = frame_->GetBoundsForTabStrip(tabstrip_);
+    gfx::Point tabstrip_origin = tabstrip_bounds.origin();
+    ConvertPointToView(GetParent(), this, &tabstrip_origin);
+    tabstrip_bounds.set_origin(tabstrip_origin);
     tabstrip_->SetBounds(tabstrip_bounds.x(), tabstrip_bounds.y(),
                          tabstrip_bounds.width(), tabstrip_bounds.height());
     return tabstrip_bounds.bottom();
   }
   return 0;
 }
 
 int BrowserView::LayoutToolbar(int top) {
   if (IsToolbarVisible()) {
     gfx::Size ps = toolbar_->GetPreferredSize();
@@ skipping 303 matching lines @@
 
 // static
 void BrowserView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     initialized = true;
   }
 }