[Extensions] Show a "refresh" bubble when needed with click-to-script

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 <utility>
 
 #include "base/auto_reset.h"
 #include "base/location.h"
@@ skipping 475 matching lines @@
                          dropped_index);
   if (delta)
     model_->SetVisibleIconCount(model_->visible_icon_count() + delta);
 }
 
 void ToolbarActionsBar::OnAnimationEnded() {
   // Check if we were waiting for animation to complete to either show a
   // message bubble, or to show a popup.
   if (pending_extension_bubble_controller_) {
     MaybeShowExtensionBubble(std::move(pending_extension_bubble_controller_));
+  } else if (pending_toolbar_bubble_controller_) {
+    ShowToolbarActionBubble(std::move(pending_toolbar_bubble_controller_));
   } else if (!popped_out_closure_.is_null()) {
     popped_out_closure_.Run();
     popped_out_closure_.Reset();
   }
 }
 
 bool ToolbarActionsBar::IsActionVisibleOnMainBar(
     const ToolbarActionViewController* action) const {
   if (in_overflow_mode())
     return main_bar_->IsActionVisibleOnMainBar(action);
@@ skipping 62 matching lines @@
 }
 
 void ToolbarActionsBar::AddObserver(ToolbarActionsBarObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void ToolbarActionsBar::RemoveObserver(ToolbarActionsBarObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
+void ToolbarActionsBar::ShowToolbarActionBubble(
+    scoped_ptr<ToolbarActionsBarBubbleDelegate> bubble) {
+  DCHECK(bubble->GetAnchorActionId().empty() ||
+         GetActionForId(bubble->GetAnchorActionId()));
+  if (delegate_->IsAnimating())
+    pending_toolbar_bubble_controller_ = std::move(bubble);
+  else
+    delegate_->ShowToolbarActionBubble(std::move(bubble));
+}
+
 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_ = std::move(controller);
   } else if (controller->ShouldShow()) {
     // We check ShouldShow() above because the affected extensions may have been
     // removed since the controller was initialized.
@@ skipping 195 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();
 }