| Index: chrome/browser/ui/views/toolbar/toolbar_view.h
|
| diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h
|
| index 6a02f5ab24be5d7f503d4af1cccbc76822b2a17f..183d482e3219db6a8f7a88bc50870f53ab129052 100644
|
| --- a/chrome/browser/ui/views/toolbar/toolbar_view.h
|
| +++ b/chrome/browser/ui/views/toolbar/toolbar_view.h
|
| @@ -152,6 +152,7 @@ class ToolbarView : public views::AccessiblePaneView,
|
|
|
| // Overridden from views::View:
|
| virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| + virtual gfx::Size GetMinimumSize() OVERRIDE;
|
| virtual void Layout() OVERRIDE;
|
| virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
|
| virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| @@ -201,6 +202,9 @@ class ToolbarView : public views::AccessiblePaneView,
|
| // Returns the number of pixels above the location bar in non-normal display.
|
| int PopupTopSpacing() const;
|
|
|
| + // Given toolbar contents of size |size|, returns the total toolbar size.
|
| + gfx::Size SizeForContentSize(gfx::Size size) const;
|
| +
|
| // Loads the images for all the child views.
|
| void LoadImages();
|
|
|
|
|