[Extensions Toolbar Mac] More cleanup of BrowserActionsController

chrome/browser/ui/toolbar/toolbar_actions_bar.cc

 // Copyright 2014 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/ui/toolbar/toolbar_actions_bar.h"
 
 #include "base/auto_reset.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 61 matching lines @@
 ToolbarActionsBar::ToolbarActionsBar(ToolbarActionsBarDelegate* delegate,
                                      Browser* browser,
                                      bool in_overflow_mode)
     : delegate_(delegate),
       browser_(browser),
       model_(extensions::ExtensionToolbarModel::Get(browser_->profile())),
       in_overflow_mode_(in_overflow_mode),
       platform_settings_(in_overflow_mode),
       model_observer_(this),
       suppress_layout_(false),
-      suppress_animation_(!model_ || !model_->extensions_initialized()) {
+      suppress_animation_(true) {
   if (model_)  // |model_| can be null in unittests.
     model_observer_.Add(model_);
 }
 
 ToolbarActionsBar::~ToolbarActionsBar() {
   // We don't just call DeleteActions() here because it makes assumptions about
   // the order of deletion between the views and the ToolbarActionsBar.
   DCHECK(toolbar_actions_.empty()) <<
       "Must call DeleteActions() before destruction.";
 }
@@ skipping 141 matching lines @@
           extensions::FeatureSwitch::extension_action_redesign()->IsEnabled());
       toolbar_actions_.insert(toolbar_actions_.end(),
                               component_actions.begin(),
                               component_actions.end());
       component_actions.weak_clear();
     }
 
     for (size_t i = 0; i < toolbar_actions_.size(); ++i)
       delegate_->AddViewForAction(toolbar_actions_[i], i);
   }
+
+  if (!toolbar_actions_.empty()) {
+    delegate_->Redraw(false);
+    ResizeDelegate(gfx::Tween::EASE_OUT, false);
+  }
+
+  // Once the actions are created, we should animate the changes.
+  suppress_animation_ = false;
 }
 
 void ToolbarActionsBar::DeleteActions() {
   delegate_->RemoveAllViews();
   toolbar_actions_.clear();
 }
 
 void ToolbarActionsBar::Update() {
   if (toolbar_actions_.empty())
     return;  // Nothing to do.
@@ skipping 173 matching lines @@
   DeleteActions();
   CreateActions();
   // Resize the delegate. We suppress the chevron so that we don't risk showing
   // it only for the duration of the animation.
   ResizeDelegate(gfx::Tween::LINEAR, true);
 }
 
 void ToolbarActionsBar::OnToolbarModelInitialized() {
   // We shouldn't have any actions before the model is initialized.
   DCHECK(toolbar_actions_.empty());
-  suppress_animation_ = false;
   CreateActions();
-  if (!toolbar_actions_.empty()) {
-    delegate_->Redraw(false);
-    ResizeDelegate(gfx::Tween::EASE_OUT, false);
-  }
 }
 
 void ToolbarActionsBar::OnToolbarReorderNecessary(
     content::WebContents* web_contents) {
   if (GetCurrentWebContents() == web_contents)
     ReorderActions();
 }
 
 Browser* ToolbarActionsBar::GetBrowser() {
   return browser_;
@@ skipping 41 matching lines @@
   for (ToolbarActionViewController* action : toolbar_actions_) {
     if (action->GetId() == id)
       return action;
   }
   return nullptr;
 }
 
 content::WebContents* ToolbarActionsBar::GetCurrentWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }