diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-19 19:09:41 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-19 19:09:41 +0000 |
| commit | aafefe34ac08b6d180004fd00d4081f307c3fed9 (patch) | |
| tree | b991200ee8e389bd6ef120c13df873ddb28903b9 /chrome/browser/views/browser_actions_container.cc | |
| parent | ce6b01219326042698c2e6e83bfa3d1231660726 (diff) | |
| download | chromium_src-aafefe34ac08b6d180004fd00d4081f307c3fed9.zip chromium_src-aafefe34ac08b6d180004fd00d4081f307c3fed9.tar.gz chromium_src-aafefe34ac08b6d180004fd00d4081f307c3fed9.tar.bz2 | |
Revert r42636. That hack is no longer needed now that we removed the compact
location bar view.
BUG=38992
Review URL: http://codereview.chromium.org/3036004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/browser_actions_container.cc')
| -rw-r--r-- | chrome/browser/views/browser_actions_container.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/views/browser_actions_container.cc b/chrome/browser/views/browser_actions_container.cc index 78cf623..65f2d31 100644 --- a/chrome/browser/views/browser_actions_container.cc +++ b/chrome/browser/views/browser_actions_container.cc @@ -361,11 +361,10 @@ void BrowserActionView::PaintChildren(gfx::Canvas* canvas) { // BrowserActionsContainer BrowserActionsContainer::BrowserActionsContainer( - Browser* browser, View* owner_view, bool should_save_size) + Browser* browser, View* owner_view) : profile_(browser->profile()), browser_(browser), owner_view_(owner_view), - should_save_size_(should_save_size), popup_(NULL), popup_button_(NULL), model_(NULL), @@ -1141,7 +1140,7 @@ void BrowserActionsContainer::AnimationEnded(const Animation* animation) { // Don't save the icon count in incognito because there may be fewer icons // in that mode. The result is that the container in a normal window is always // at least as wide as in an incognito window. - if (!profile_->IsOffTheRecord() && should_save_size_) + if (!profile_->IsOffTheRecord()) model_->SetVisibleIconCount(VisibleBrowserActions()); } |