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

chrome/browser/views/detachable_toolbar_view.h

Index: chrome/browser/views/detachable_toolbar_view.h
===================================================================
--- chrome/browser/views/detachable_toolbar_view.h	(revision 56738)
+++ chrome/browser/views/detachable_toolbar_view.h	(working copy)
@@ -31,10 +31,12 @@
   // Gets the current amount of overlap atop the browser toolbar.
   virtual int GetToolbarOverlap() const = 0;
 
-  // Paint the background (including the theme image behind content area) when
-  // in bar/shelf is attached to the Chrome frame.
+  // Paints the background (including the theme image behind content area) when
+  // the bar/shelf is attached to the top toolbar.  |background_origin| is the
+  // origin to use for painting the theme image.
   static void PaintBackgroundAttachedMode(gfx::Canvas* canvas,
-                                          views::View* view);
+                                          views::View* view,
+                                          const gfx::Point& background_origin);
 
   // Calculate the rect for the content area of the bar/shelf. This is only
   // needed when the bar/shelf is detached from the Chrome frame (otherwise the