diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-23 00:08:19 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-23 00:08:19 +0000 |
| commit | 778c0d933118eec1b9a027010051e432d6d09852 (patch) | |
| tree | eaa868f55e0174d3fea22a8df0cc7d81bd2aa123 /chrome/browser/views/bookmark_bar_view.h | |
| parent | 28b5a8494387b85fa19ca61940760e08954bcaa3 (diff) | |
| download | chromium_src-778c0d933118eec1b9a027010051e432d6d09852.zip chromium_src-778c0d933118eec1b9a027010051e432d6d09852.tar.gz chromium_src-778c0d933118eec1b9a027010051e432d6d09852.tar.bz2 | |
Don't allow the browser window to be resized so small that layout starts breaking horribly. When it _is_ small, draw the frame correctly.This is an incomplete fix; only non-Aero main/popup/app windows are handled so far, but this was becoming hairy enough I wanted to checkpoint it.BUG=9885
Review URL: http://codereview.chromium.org/88069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view.h')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h index 0726449..5947c60 100644 --- a/chrome/browser/views/bookmark_bar_view.h +++ b/chrome/browser/views/bookmark_bar_view.h @@ -90,6 +90,7 @@ class BookmarkBarView : public views::View, // View methods: virtual gfx::Size GetPreferredSize(); + virtual gfx::Size GetMinimumSize(); virtual void Layout(); virtual void DidChangeBounds(const gfx::Rect& previous, const gfx::Rect& current); @@ -138,8 +139,9 @@ class BookmarkBarView : public views::View, // True if we're on a page where the bookmarks bar is always visible. bool OnNewTabPage(); - // How much we want the bookmark bar to overlap the toolbar. - int GetToolbarOverlap(); + // How much we want the bookmark bar to overlap the toolbar. If |return_max| + // is true, we return the maximum overlap rather than the current overlap. + int GetToolbarOverlap(bool return_max); // Whether or not we are animating. bool IsAnimating() { return size_animation_->IsAnimating(); } |