Revert r42636. That hack is no longer needed now that we removed the compact

chrome/browser/views/browser_actions_container.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/browser_actions_container.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "base/stl_util-inl.h"
@@ skipping 343 matching lines @@
   if (tab_id < 0)
     return;
 
   action->PaintBadge(canvas, gfx::Rect(width(), height()), tab_id);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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),
       resize_gripper_(NULL),
       chevron_(NULL),
       overflow_menu_(NULL),
       suppress_chevron_(false),
       resize_amount_(0),
       animation_target_size_(0),
       drop_indicator_position_(-1),
@@ skipping 755 matching lines @@
 void BrowserActionsContainer::AnimationEnded(const Animation* animation) {
   container_size_.set_width(animation_target_size_);
   animation_target_size_ = 0;
   resize_amount_ = 0;
   OnBrowserActionVisibilityChanged();
   suppress_chevron_ = false;
 
   // 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());
 }
 
 void BrowserActionsContainer::NotifyMenuDeleted(
     BrowserActionOverflowMenuController* controller) {
   DCHECK(controller == overflow_menu_);
   overflow_menu_ = NULL;
 }
 
 void BrowserActionsContainer::InspectPopup(
     ExtensionAction* action) {
   OnBrowserActionExecuted(GetBrowserActionView(action)->button(),
       true);  // |inspect_with_devtools|.
 }
 
 void BrowserActionsContainer::ExtensionPopupIsClosing(ExtensionPopup* popup) {
   // ExtensionPopup is ref-counted, so we don't need to delete it.
   DCHECK_EQ(popup_, popup);
   popup_ = NULL;
   popup_button_->SetButtonNotPushed();
   popup_button_ = NULL;
 }
 
 bool BrowserActionsContainer::ShouldDisplayBrowserAction(Extension* extension) {
   // Only display incognito-enabled extensions while in incognito mode.
   return (!profile_->IsOffTheRecord() ||
           profile_->GetExtensionsService()->IsIncognitoEnabled(extension));
 }