[Mac Extensions Toolbar] Make the container's animationEndFrame always valid

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/sessions/session_tab_helper.h"
@@ skipping 43 matching lines @@
         ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_BROWSER_ACTION);
     icon_height = skia->height();
     icon_width = skia->width();
   }
   return type == WIDTH ? icon_width : icon_height;
 }
 
 }  // namespace
 
+// static
+bool ToolbarActionsBar::disable_animations_during_testing_ = false;
+
 ToolbarActionsBar::PlatformSettings::PlatformSettings(bool in_overflow_mode)
     : left_padding(in_overflow_mode ? kOverflowLeftPadding : kLeftPadding),
       right_padding(in_overflow_mode ? kOverflowRightPadding : kRightPadding),
       item_spacing(kItemSpacing),
       icons_per_overflow_menu_row(1),
       chevron_enabled(!extensions::FeatureSwitch::extension_action_redesign()->
                           IsEnabled()) {
 }
 
 ToolbarActionsBar::ToolbarActionsBar(ToolbarActionsBarDelegate* delegate,
@@ skipping 168 matching lines @@
           extensions::FeatureSwitch::extension_action_redesign()->IsEnabled());
       toolbar_actions_.insert(toolbar_actions_.end(),
                               component_actions.begin(),
                               component_actions.end());
       component_actions.weak_clear();
     }
 
     if (!toolbar_actions_.empty())
       ReorderActions();
 
+
     for (size_t i = 0; i < toolbar_actions_.size(); ++i)
       delegate_->AddViewForAction(toolbar_actions_[i], i);
   }
 
   // Once the actions are created, we should animate the changes.
   suppress_animation_ = false;
 }
 
 void ToolbarActionsBar::DeleteActions() {
   delegate_->RemoveAllViews();
@@ skipping 256 matching lines @@
   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());
   CreateActions();
+  ResizeDelegate(gfx::Tween::EASE_OUT, false);
 }
 
 Browser* ToolbarActionsBar::GetBrowser() {
   return browser_;
 }
 
 void ToolbarActionsBar::TabInsertedAt(content::WebContents* web_contents,
                                       int index,
                                       bool foreground) {
   if (foreground)
@@ skipping 71 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();
 }