diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 20:54:38 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 20:54:38 +0000 |
| commit | 52d326169dc7bd04f37976c1a606a37b7ba2c380 (patch) | |
| tree | 3c82669ba0b18fd7759e577254ef0e2a7595b5e8 /chrome/browser/ui/views/toolbar_view.cc | |
| parent | b791effd60d54492f0e7cacf4c10d286fcd76ffe (diff) | |
| download | chromium_src-52d326169dc7bd04f37976c1a606a37b7ba2c380.zip chromium_src-52d326169dc7bd04f37976c1a606a37b7ba2c380.tar.gz chromium_src-52d326169dc7bd04f37976c1a606a37b7ba2c380.tar.bz2 | |
Include preferred width of location bar in minimum toolbar size.
This is a pre-requisite of properly calculating the minimum window size, which I am working on.
BUG=9885
TEST=none
Review URL: http://codereview.chromium.org/7348007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92225 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/toolbar_view.cc')
| -rw-r--r-- | chrome/browser/ui/views/toolbar_view.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 046b1b3..e9159b6 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -456,6 +456,7 @@ gfx::Size ToolbarView::GetPreferredSize() { reload_->GetPreferredSize().width() + kStandardSpacing + (show_home_button_.GetValue() ? (home_->GetPreferredSize().width() + kButtonSpacing) : 0) + + location_bar_->GetPreferredSize().width() + browser_actions_->GetPreferredSize().width() + app_menu_->GetPreferredSize().width() + kEdgeSpacing; |