[Extensions Toolbar] Fix action pop out bug and views animation

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 "base/location.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_message_bubble_controller.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/extension_action_view_controller.h"
 #include "chrome/browser/ui/extensions/extension_message_bubble_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h"
 #include "chrome/common/pref_names.h"
 #include "components/crx_file/id_util.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/runtime_data.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/feature_switch.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 95 matching lines @@
       weak_ptr_factory_(this) {
   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.";
+  FOR_EACH_OBSERVER(ToolbarActionsBarObserver, observers_,
+                    OnToolbarActionsBarDestroyed());
 }
 
 // static
 int ToolbarActionsBar::IconWidth(bool include_padding) {
   return GetIconDimension(WIDTH) + (include_padding ? kItemSpacing : 0);
 }
 
 // static
 int ToolbarActionsBar::IconHeight() {
   return GetIconDimension(HEIGHT);
@@ skipping 295 matching lines @@
 
 void ToolbarActionsBar::OnDragStarted() {
   // All drag-and-drop commands should go to the main bar.
   ToolbarActionsBar* main_bar = in_overflow_mode() ? main_bar_ : this;
   DCHECK(!main_bar->is_drag_in_progress_);
   main_bar->is_drag_in_progress_ = true;
 }
 
 void ToolbarActionsBar::OnDragEnded() {
   // All drag-and-drop commands should go to the main bar.
-  ToolbarActionsBar* main_bar = in_overflow_mode() ? main_bar_ : this;
-  DCHECK(main_bar->is_drag_in_progress_);
-  main_bar->is_drag_in_progress_ = false;
+  if (in_overflow_mode()) {
+    main_bar_->OnDragEnded();
+    return;
+  }
+
+  DCHECK(is_drag_in_progress_);
+  is_drag_in_progress_ = false;
+  FOR_EACH_OBSERVER(ToolbarActionsBarObserver,
+                    observers_, OnToolbarActionDragDone());
 }
 
 void ToolbarActionsBar::OnDragDrop(int dragged_index,
                                    int dropped_index,
                                    DragType drag_type) {
   if (in_overflow_mode()) {
     // All drag-and-drop commands should go to the main bar.
     main_bar_->OnDragDrop(dragged_index, dropped_index, drag_type);
     return;
   }
@@ skipping 79 matching lines @@
     popup_owner_->HidePopup();
   DCHECK(!popup_owner_);
 }
 
 ToolbarActionViewController* ToolbarActionsBar::GetMainControllerForAction(
     ToolbarActionViewController* action) {
   return in_overflow_mode() ?
       main_bar_->GetActionForId(action->GetId()) : action;
 }
 
+void ToolbarActionsBar::AddObserver(ToolbarActionsBarObserver* observer) {
+  observers_.AddObserver(observer);
+}
+
+void ToolbarActionsBar::RemoveObserver(ToolbarActionsBarObserver* observer) {
+  observers_.RemoveObserver(observer);
+}
+
 void ToolbarActionsBar::MaybeShowExtensionBubble(
     scoped_ptr<extensions::ExtensionMessageBubbleController> controller) {
   controller->HighlightExtensionsIfNecessary();  // Safe to call multiple times.
   if (delegate_->IsAnimating()) {
     // If the toolbar is animating, we can't effectively anchor the bubble,
     // so wait until animation stops.
     pending_extension_bubble_controller_ = controller.Pass();
   } else if (controller->ShouldShow()) {
     // We check ShouldShow() above because the affected extensions may have been
     // removed since the controller was initialized.
@@ skipping 123 matching lines @@
     // the current animation with the current width.
     delegate_->StopAnimating();
   } else {
     // We may already be at the right size (this can happen frequently with
     // overflow, where we have a fixed width, and in tests, where we skip
     // animations). If this is the case, we still need to Redraw(), because the
     // icons within the toolbar may have changed (e.g. if we removed one
     // action and added a different one in quick succession).
     delegate_->Redraw(false);
   }
+
+  FOR_EACH_OBSERVER(ToolbarActionsBarObserver,
+                    observers_, OnToolbarActionsBarDidStartResize());
 }
 
 void ToolbarActionsBar::OnToolbarHighlightModeChanged(bool is_highlighting) {
   if (!model_->actions_initialized())
     return;
 
   {
     base::AutoReset<bool> layout_resetter(&suppress_layout_, true);
     base::AutoReset<bool> animation_resetter(&suppress_animation_, true);
     std::set<std::string> seen;
@@ skipping 64 matching lines @@
   for (ToolbarActionViewController* action : toolbar_actions_) {
     if (action->GetId() == action_id)
       return action;
   }
   return nullptr;
 }
 
 content::WebContents* ToolbarActionsBar::GetCurrentWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }