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

chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.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/views/toolbar/extension_toolbar_menu_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 12 matching lines @@
 // This can be changed for tests.
 int g_close_menu_delay = 300;
 }
 
 ExtensionToolbarMenuView::ExtensionToolbarMenuView(Browser* browser,
                                                    WrenchMenu* app_menu)
     : browser_(browser),
       app_menu_(app_menu),
       container_(nullptr),
       max_height_(0),
-      browser_actions_container_observer_(this),
+      toolbar_actions_bar_observer_(this),
       weak_factory_(this) {
   BrowserActionsContainer* main =
       BrowserView::GetBrowserViewForBrowser(browser_)
           ->toolbar()->browser_actions();
   container_ = new BrowserActionsContainer(browser_, main);
   container_->Init();
   SetContents(container_);
   // We Layout() the container here so that we know the number of actions
   // that will be visible in ShouldShow().
   container_->Layout();
 
   // Listen for the drop to finish so we can close the app menu, if necessary.
-  browser_actions_container_observer_.Add(container_);
-  browser_actions_container_observer_.Add(main);
+  toolbar_actions_bar_observer_.Add(main->toolbar_actions_bar());
 
   // In *very* extreme cases, it's possible that there are so many overflowed
   // actions, we won't be able to show them all. Cap the height so that the
   // overflow won't be excessively tall (at 8 icons per row, this allows for
   // 104 total extensions).
   const int kMaxOverflowRows = 13;
   max_height_ = ToolbarActionsBar::IconHeight() * kMaxOverflowRows;
   ClipHeightTo(0, max_height_);
 }
 
@@ skipping 29 matching lines @@
 void ExtensionToolbarMenuView::Layout() {
   SetPosition(gfx::Point(start_padding(), 0));
   SizeToPreferredSize();
   views::ScrollView::Layout();
 }
 
 void ExtensionToolbarMenuView::set_close_menu_delay_for_testing(int delay) {
   g_close_menu_delay = delay;
 }
 
-void ExtensionToolbarMenuView::OnBrowserActionsContainerDestroyed(
-    BrowserActionsContainer* browser_actions_container) {
-  browser_actions_container_observer_.Remove(browser_actions_container);
+void ExtensionToolbarMenuView::OnToolbarActionsBarDestroyed() {
+  toolbar_actions_bar_observer_.RemoveAll();
 }
 
-void ExtensionToolbarMenuView::OnBrowserActionDragDone() {
+void ExtensionToolbarMenuView::OnToolbarActionDragDone() {
   // In the case of a drag-and-drop, the bounds of the container may have
-  // changed (in the case of removing an icon that was the last in a row). We
-  // need to re-layout the menu in order to shrink down the view (calling
-  // Layout() on this is insufficient because other items may need to shift
-  // upwards).
-  parent()->parent()->Layout();
+  // changed (in the case of removing an icon that was the last in a row).
+  Redraw();
 
   // We need to close the app menu if it was just opened for the drag and drop,
   // or if there are no more extensions in the overflow menu after a drag and
   // drop.
   if (app_menu_->for_drop() ||
       container_->toolbar_actions_bar()->GetIconCount() == 0) {
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE, base::Bind(&ExtensionToolbarMenuView::CloseAppMenu,
                               weak_factory_.GetWeakPtr()),
         base::TimeDelta::FromMilliseconds(g_close_menu_delay));
   }
 }
 
+void ExtensionToolbarMenuView::OnToolbarActionsBarDidStartResize() {
+  Redraw();
+}
+
 void ExtensionToolbarMenuView::CloseAppMenu() {
   app_menu_->CloseMenu();
 }
 
+void ExtensionToolbarMenuView::Redraw() {
+  // In a case where the size of the container may have changed (e.g., by a row
+  // being added or removed), We need to re-layout the menu in order to resize

[Avi (use Gerrit), 2015/10/22 21:32:02]

lower-case "we"

[Devlin, 2015/10/22 22:18:05]

Whoops, done.

+  // the view (calling Layout() on this is insufficient because other items may
+  // need to shift up or down).
+  parent()->parent()->Layout();
+  // The Menus layout code doesn't recursively call layout on its children like
+  // the default View code. Explicitly layout this view.
+  Layout();
+}
+
 int ExtensionToolbarMenuView::start_padding() const {
   // We pad enough on the left so that the first icon starts at the same point
   // as the labels. We subtract kItemSpacing because there needs to be padding
   // so we can see the drop indicator.
   return views::MenuItemView::label_start() -
       container_->toolbar_actions_bar()->platform_settings().item_spacing;
 }