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

chrome/browser/views/frame/browser_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_BROWSER_VIEW_H_
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 102 matching lines @@
   int GetShowState() const;
 
   // Called by the frame to notify the BrowserView that it was moved, and that
   // any dependent popup windows should be repositioned.
   void WindowMoved();
 
   // Called by the frame to notify the BrowserView that a move or resize was
   // initiated.
   void WindowMoveOrResizeStarted();
 
-  // Returns the bounds of the toolbar, in BrowserView coordinates.
+  // Returns the apparent bounds of the toolbar, in BrowserView coordinates.
+  // These differ from |toolbar_.bounds()| in that they match where the toolbar
+  // background image is drawn -- slightly outside the "true" bounds
+  // horizontally, and, when using vertical tabs, behind the tab column.
   gfx::Rect GetToolbarBounds() const;
 
   // Returns the bounds of the content area, in the coordinates of the
   // BrowserView's parent.
   gfx::Rect GetClientAreaBounds() const;
 
   // Returns true if the Find Bar should be rendered such that it appears to
   // blend with the Bookmarks Bar. False if it should appear to blend with the
   // main Toolbar. The return value will vary depending on whether or not the
   // Bookmark Bar is always shown.
   bool ShouldFindBarBlendWithBookmarksBar() const;
 
   // Returns the constraining bounding box that should be used to lay out the
   // FindBar within. This is _not_ the size of the find bar, just the bounding
   // box it should be laid out within. The coordinate system of the returned
   // rect is in the coordinate system of the frame, since the FindBar is a child
   // window.
   gfx::Rect GetFindBarBoundingBox() const;
 
   // Returns the preferred height of the TabStrip. Used to position the OTR
   // avatar icon.
   int GetTabStripHeight() const;
 
-  // Returns the bounds of the TabStrip. Used by themed views to determine the
-  // offset of IDR_THEME_TOOLBAR.
-  gfx::Rect GetTabStripBounds() const;
+  // Takes some view's origin (relative to this BrowserView) and offsets it such
+  // that it can be used as the source origin for seamlessly tiling the toolbar
+  // background image over that view.
+  gfx::Point OffsetPointForToolbarBackgroundImage(
+      const gfx::Point& point) const;
 
   // Accessor for the big icon used with TYPE_EXTENSION_APP, or NULL if this
   // browser isn't TYPE_EXTENSION_APP.
   views::ImageView* extension_app_icon() const { return extension_app_icon_; }
 
   // Accessor for the big title used with TYPE_EXTENSION_APP, or NULL if this
   // browser isn't TYPE_EXTENSION_APP.
   views::Label* extension_app_title() const { return extension_app_title_; }
 
   // Accessor for the TabStrip.
@@ skipping 440 matching lines @@
 
   scoped_ptr<AccessibleViewHelper> accessible_view_helper_;
 
   // Loads extension_app_icon_ asynchronously on the file thread.
   ImageLoadingTracker extension_app_icon_loader_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_