diff options
| author | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-23 16:30:36 +0000 |
|---|---|---|
| committer | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-23 16:30:36 +0000 |
| commit | e98e82ac535ece8199fc0607b337b6cc1767e305 (patch) | |
| tree | 4fe00b69bd025957d4ecbb9a5a5800d890eee7d0 /chrome/browser/views/bookmark_bar_view.cc | |
| parent | 629855fd02bc07563a723df7bb0b0b56cf373cc1 (diff) | |
| download | chromium_src-e98e82ac535ece8199fc0607b337b6cc1767e305.zip chromium_src-e98e82ac535ece8199fc0607b337b6cc1767e305.tar.gz chromium_src-e98e82ac535ece8199fc0607b337b6cc1767e305.tar.bz2 | |
Reverting r14276 (http://codereview.chromium.org/88069) which causes unit test breakage.
Example: http://build.chromium.org/buildbot/waterfall/builders/XP%20Tests%20(dbg)(2)/builds/1268/steps/unit_tests/logs/stdio
TBR=http://codereview.chromium.org/95010
Review URL: http://codereview.chromium.org/95010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14314 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view.cc')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 364624c..5acf012 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -529,10 +529,6 @@ gfx::Size BookmarkBarView::GetPreferredSize() { return prefsize; } -gfx::Size BookmarkBarView::GetMinimumSize() { - return gfx::Size(0, kBarHeight); -} - void BookmarkBarView::Layout() { if (!GetParent()) return; @@ -895,9 +891,8 @@ bool BookmarkBarView::OnNewTabPage() { browser_->GetSelectedTabContents()->IsBookmarkBarAlwaysVisible()); } -int BookmarkBarView::GetToolbarOverlap(bool return_max) { - return static_cast<int>(kToolbarOverlap * - (return_max ? 1.0 : size_animation_->GetCurrentValue())); +int BookmarkBarView::GetToolbarOverlap() { + return static_cast<int>(size_animation_->GetCurrentValue() * kToolbarOverlap); } void BookmarkBarView::AnimationProgressed(const Animation* animation) { |