[Extensions UI] Use the ExtensionMessageBubbleBridge for Views platforms

chrome/browser/ui/toolbar/toolbar_actions_bar.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_
 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_
 
 #include <stddef.h>
 
+#include <memory>
+
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/geometry/size.h"
@@ skipping 154 matching lines @@
   // |drag_type| indicates whether or not the icon was dragged between the
   // overflow and main containers.
   // The main container should handle all drag/drop notifications.
   void OnDragDrop(int dragged_index,
                   int dropped_index,
                   DragType drag_type);
 
   // Notifies the ToolbarActionsBar that the delegate finished animating.
   void OnAnimationEnded();
 
+  // Called when the active bubble is closed.
+  void OnBubbleClosed();
+
   // Returns true if the given |action| is visible on the main toolbar.
   bool IsActionVisibleOnMainBar(const ToolbarActionViewController* action)
       const;
 
   // Pops out a given |action|, ensuring it is visible.
   // |is_sticky| refers to whether or not the action will stay popped out if
   // the overflow menu is opened.
   // |closure| will be called once any animation is complete.
   void PopOutAction(ToolbarActionViewController* action,
                     bool is_sticky,
@@ skipping 136 matching lines @@
   ToolbarActionViewController* popped_out_action_;
 
   // True if the popped out action is "sticky", meaning it will stay popped
   // out even if another menu is opened.
   bool is_popped_out_sticky_;
 
   // The task to alert the |popped_out_action_| that animation has finished, and
   // it is fully popped out.
   base::Closure popped_out_closure_;
 
-  // The controller of the extension message bubble to show once animation
-  // finishes, if any. This has priority over
-  // |pending_toolbar_bubble_controller_|.
-  std::unique_ptr<extensions::ExtensionMessageBubbleController>
-      pending_extension_bubble_controller_;
-
   // The controller for the toolbar action bubble to show once animation
   // finishes, if any.
-  std::unique_ptr<ToolbarActionsBarBubbleDelegate>
-      pending_toolbar_bubble_controller_;
+  std::unique_ptr<ToolbarActionsBarBubbleDelegate> pending_bubble_controller_;
+
+  // True if a bubble is currently being shown.
+  bool is_showing_bubble_;
 
   base::ObserverList<ToolbarActionsBarObserver> observers_;
 
   base::WeakPtrFactory<ToolbarActionsBar> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBar);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_H_