Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1283)

Unified Diff: chrome/browser/views/browser_actions_container.cc

Issue 3036004: Revert r42636. That hack is no longer needed now that we removed the compact (Closed)
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/views/browser_actions_container.h ('k') | chrome/browser/views/toolbar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/browser_actions_container.cc
diff --git a/chrome/browser/views/browser_actions_container.cc b/chrome/browser/views/browser_actions_container.cc
index 78cf62352d9928f728aa057cdf2f872530f2e93c..65f2d31f931031c923c823a48e6e17d539f9315f 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());
}
« no previous file with comments | « chrome/browser/views/browser_actions_container.h ('k') | chrome/browser/views/toolbar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698