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

3 files changed, 4 insertions, 11 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());
 }
 
diff --git a/chrome/browser/views/browser_actions_container.h b/chrome/browser/views/browser_actions_container.h
index ce7ed70..8fb070d 100644
--- a/chrome/browser/views/browser_actions_container.h
+++ b/chrome/browser/views/browser_actions_container.h
@@ -258,10 +258,7 @@ class BrowserActionsContainer
     public ExtensionContextMenuModel::PopupDelegate,
     public ExtensionPopup::Observer {
  public:
-  // If |should_save_size| is false, container resizes will not persist across
-  // browser restarts.
-  BrowserActionsContainer(Browser* browser, views::View* owner_view,
-                          bool should_save_size);
+  BrowserActionsContainer(Browser* browser, views::View* owner_view);
   virtual ~BrowserActionsContainer();
 
   static void RegisterUserPrefs(PrefService* prefs);
@@ -453,9 +450,6 @@ class BrowserActionsContainer
   // The view that owns us.
   views::View* owner_view_;
 
-  // True if we should save the size of the container to the global prefs.
-  bool should_save_size_;
-
   // The current popup and the button it came from.  NULL if no popup.
   ExtensionPopup* popup_;
 
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index ea91539..30bd21f 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -156,7 +156,7 @@ void ToolbarView::Init(Profile* profile) {
   reload_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_RELOAD));
   reload_->SetID(VIEW_ID_RELOAD_BUTTON);
 
-  browser_actions_ = new BrowserActionsContainer(browser_, this, true);
+  browser_actions_ = new BrowserActionsContainer(browser_, this);
 
   if (!WrenchMenuModel::IsEnabled()) {
     page_menu_ = new views::MenuButton(NULL, std::wstring(), this, false);