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

chrome/browser/ui/views/toolbar/browser_actions_container.cc

 // Copyright 2013 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/views/toolbar/browser_actions_container.h"
 
 #include "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_message_bubble_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
 #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h"
 #include "chrome/browser/ui/views/extensions/extension_toolbar_icon_surfacing_bubble_views.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/app_menu_button.h"
-#include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/extensions/command.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/common/feature_switch.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/nine_image_painter_factory.h"
@@ skipping 86 matching lines @@
   }
 }
 
 BrowserActionsContainer::~BrowserActionsContainer() {
   if (active_bubble_)
     active_bubble_->GetWidget()->Close();
   // We should synchronously receive the OnWidgetClosing() event, so we should
   // always have cleared the active bubble by now.
   DCHECK(!active_bubble_);
 
-  FOR_EACH_OBSERVER(BrowserActionsContainerObserver, observers_,
-                    OnBrowserActionsContainerDestroyed(this));
-
   toolbar_actions_bar_->DeleteActions();
   // All views should be removed as part of ToolbarActionsBar::DeleteActions().
   DCHECK(toolbar_action_views_.empty());
 }
 
 void BrowserActionsContainer::Init() {
   LoadImages();
 }
 
 std::string BrowserActionsContainer::GetIdAt(size_t index) const {
@@ skipping 38 matching lines @@
   extension_keybinding_registry_->ExecuteCommand(extension->id(),
                                                  command.accelerator());
 }
 
 bool BrowserActionsContainer::ShownInsideMenu() const {
   return in_overflow_mode();
 }
 
 void BrowserActionsContainer::OnToolbarActionViewDragDone() {
   toolbar_actions_bar_->OnDragEnded();
-  FOR_EACH_OBSERVER(BrowserActionsContainerObserver,
-                    observers_,
-                    OnBrowserActionDragDone());
 }
 
 views::MenuButton* BrowserActionsContainer::GetOverflowReferenceView() {
   // With traditional overflow, the reference is the chevron. With the redesign,
   // we use the app menu instead.
   return chevron_ ? static_cast<views::MenuButton*>(chevron_)
                   : static_cast<views::MenuButton*>(
                         GetToolbarView(browser_)->app_menu_button());
 }
 
@@ skipping 60 matching lines @@
         // Find where the correct view is (it's guaranteed to be after our
         // current index, since everything up to this point is correct).
         int j = i + 1;
         while (actions[i] != toolbar_action_views_[j]->view_controller())
           ++j;
         std::swap(toolbar_action_views_[i], toolbar_action_views_[j]);
       }
     }
   }
 
-  if (width() != GetPreferredSize().width() && parent()) {
-    parent()->Layout();
-    parent()->SchedulePaint();
-  } else {
-    Layout();
-    SchedulePaint();
-  }
+  Layout();
 }
 
 void BrowserActionsContainer::ResizeAndAnimate(
     gfx::Tween::Type tween_type,
     int target_width,
     bool suppress_chevron) {
   if (resize_animation_ && !toolbar_actions_bar_->suppress_animation()) {
     if (!in_overflow_mode()) {
       // Make sure we don't try to animate to wider than the allowed width.
       int max_width = GetToolbarView(browser_)->GetMaxBrowserActionsWidth();
@@ skipping 77 matching lines @@
     // If we can't even show the minimum width, just throw in the towel (and
     // show nothing).
     if (max_width < toolbar_actions_bar_->GetMinimumWidth())
       return 0;
     preferred_width = toolbar_actions_bar_->IconCountToWidth(
         toolbar_actions_bar_->WidthToIconCount(max_width));
   }
   return preferred_width;
 }
 
-void BrowserActionsContainer::AddObserver(
-    BrowserActionsContainerObserver* observer) {
-  observers_.AddObserver(observer);
-}
-
-void BrowserActionsContainer::RemoveObserver(
-    BrowserActionsContainerObserver* observer) {
-  observers_.RemoveObserver(observer);
-}
-
 gfx::Size BrowserActionsContainer::GetPreferredSize() const {
   if (in_overflow_mode())
     return toolbar_actions_bar_->GetPreferredSize();
 
   // If there are no actions to show, then don't show the container at all.
   if (toolbar_action_views_.empty())
     return gfx::Size();
 
   // When resizing, preferred width is the starting width - resize amount.
   // Otherwise, use the normal preferred width.
@@ skipping 248 matching lines @@
   if (toolbar_actions_bar_->is_highlighting() || animating())
     return;
 
   // If this is the start of the resize gesture, initialize the starting
   // width.
   if (resize_starting_width_ == -1)
     resize_starting_width_ = width();
 
   if (!done_resizing) {
     resize_amount_ = resize_amount;
-    Redraw(false);
+    parent()->Layout();
     return;
   }
 
   // Up until now we've only been modifying the resize_amount, but now it is
   // time to set the container size to the size we have resized to, and then
   // animate to the nearest icon count size if necessary (which may be 0).
   int ending_width =
       std::min(std::max(toolbar_actions_bar_->GetMinimumWidth(),
                         resize_starting_width_ - resize_amount),
                toolbar_actions_bar_->GetMaximumWidth());
   resize_starting_width_ = -1;
   toolbar_actions_bar_->OnResizeComplete(ending_width);
 }
 
 void BrowserActionsContainer::AnimationProgressed(
     const gfx::Animation* animation) {
   DCHECK_EQ(resize_animation_.get(), animation);
   resize_amount_ = static_cast<int>(resize_animation_->GetCurrentValue() *
       (resize_starting_width_ - animation_target_size_));
-  Redraw(false);
+  parent()->Layout();
 }
 
 void BrowserActionsContainer::AnimationCanceled(
     const gfx::Animation* animation) {
   AnimationEnded(animation);
 }
 
 void BrowserActionsContainer::AnimationEnded(const gfx::Animation* animation) {
   animation_target_size_ = 0;
   resize_amount_ = 0;
   resize_starting_width_ = -1;
   suppress_chevron_ = false;
-  Redraw(false);
-  FOR_EACH_OBSERVER(BrowserActionsContainerObserver,
-                    observers_,
-                    OnBrowserActionsContainerAnimationEnded());
+  parent()->Layout();
 
   toolbar_actions_bar_->OnAnimationEnded();
 }
 
 content::WebContents* BrowserActionsContainer::GetCurrentWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 extensions::ActiveTabPermissionGranter*
     BrowserActionsContainer::GetActiveTabPermissionGranter() {
@@ skipping 103 matching lines @@
   warning_highlight_painter_.reset(
       views::Painter::CreateImageGridPainter(kWarningImages));
 }
 
 void BrowserActionsContainer::ClearActiveBubble(views::Widget* widget) {
   DCHECK(active_bubble_);
   DCHECK_EQ(active_bubble_->GetWidget(), widget);
   widget->RemoveObserver(this);
   active_bubble_ = nullptr;
 }