diff options
Diffstat (limited to 'chrome/browser/ui/toolbar/toolbar_actions_bar.h')
| -rw-r--r-- | chrome/browser/ui/toolbar/toolbar_actions_bar.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar.h b/chrome/browser/ui/toolbar/toolbar_actions_bar.h index 1c04dae..871db82 100644 --- a/chrome/browser/ui/toolbar/toolbar_actions_bar.h +++ b/chrome/browser/ui/toolbar/toolbar_actions_bar.h @@ -211,6 +211,10 @@ class ToolbarActionsBar : public ToolbarActionsModel::Observer { void AddObserver(ToolbarActionsBarObserver* observer); void RemoveObserver(ToolbarActionsBarObserver* observer); + // Displays the given |bubble| once the toolbar is no longer animating. + void ShowToolbarActionBubble( + scoped_ptr<ToolbarActionsBarBubbleDelegate> bubble); + // Returns the underlying toolbar actions, but does not order them. Primarily // for use in testing. const std::vector<ToolbarActionViewController*>& toolbar_actions_unordered() @@ -336,10 +340,17 @@ class ToolbarActionsBar : public ToolbarActionsModel::Observer { // it is fully popped out. base::Closure popped_out_closure_; - // The controller of the bubble to show once animation finishes, if any. + // The controller of the extension message bubble to show once animation + // finishes, if any. This has priority over + // |pending_toolbar_bubble_controller_|. scoped_ptr<extensions::ExtensionMessageBubbleController> pending_extension_bubble_controller_; + // The controller for the toolbar action bubble to show once animation + // finishes, if any. + scoped_ptr<ToolbarActionsBarBubbleDelegate> + pending_toolbar_bubble_controller_; + base::ObserverList<ToolbarActionsBarObserver> observers_; base::WeakPtrFactory<ToolbarActionsBar> weak_ptr_factory_; |