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

chrome/browser/views/detachable_toolbar_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_DETACHABLE_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_DETACHABLE_TOOLBAR_VIEW_H_
 
 #include "chrome/browser/views/accessible_toolbar_view.h"
 
 class SkBitmap;
@@ skipping 13 matching lines @@
 
   // Whether the view is currently detached from the Chrome frame.
   virtual bool IsDetached() const = 0;
 
   // Gets the current state of the resize animation (show/hide).
   virtual double GetAnimationValue() const = 0;
 
   // 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
   // content area is the whole area of the bar/shelf. When detached, however,
   // only a small round rectangle is for drawing our content on. This calculates
   // how big this area is, where it is located within the shelf and how round
   // the edges should be.
   static void CalculateContentArea(double animation_state,
                                    double horizontal_padding,
                                    double vertical_padding,
@@ skipping 31 matching lines @@
                                    int vertical_padding,
                                    const SkColor& top_color,
                                    const SkColor& middle_color,
                                    const SkColor& bottom_color);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DetachableToolbarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_DETACHABLE_TOOLBAR_VIEW_H_