| Index: chrome/browser/ui/toolbar/toolbar_actions_model.h
|
| diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model.h b/chrome/browser/ui/toolbar/toolbar_actions_model.h
|
| index b3029ec8bc11e8a789d7d5add0bda3515ee80e43..b8b99d536d65d794271752be8f3c83fc5d9e60fa 100644
|
| --- a/chrome/browser/ui/toolbar/toolbar_actions_model.h
|
| +++ b/chrome/browser/ui/toolbar/toolbar_actions_model.h
|
| @@ -29,6 +29,7 @@ class ToolbarActionViewController;
|
|
|
| namespace extensions {
|
| class ExtensionActionManager;
|
| +class ExtensionMessageBubbleController;
|
| class ExtensionRegistry;
|
| class ExtensionSet;
|
| }
|
| @@ -172,6 +173,11 @@ class ToolbarActionsModel
|
| bool is_highlighting() const { return highlight_type_ != HIGHLIGHT_NONE; }
|
| HighlightType highlight_type() const { return highlight_type_; }
|
|
|
| + bool has_active_bubble() const { return has_active_bubble_; }
|
| + void set_has_active_bubble(bool has_active_bubble) {
|
| + has_active_bubble_ = has_active_bubble;
|
| + }
|
| +
|
| void SetActionVisibility(const std::string& action_id, bool visible);
|
|
|
| // ComponentMigrationHelper::ComponentActionDelegate:
|
| @@ -193,6 +199,11 @@ class ToolbarActionsModel
|
| // number of visible icons will be reset to what it was before highlighting.
|
| void StopHighlighting();
|
|
|
| + // Gets the ExtensionMessageBubbleController that should be shown for this
|
| + // profile, if any.
|
| + std::unique_ptr<extensions::ExtensionMessageBubbleController>
|
| + GetExtensionMessageBubbleController(Browser* browser);
|
| +
|
| private:
|
| // Callback when actions are ready.
|
| void OnReady();
|
| @@ -312,6 +323,10 @@ class ToolbarActionsModel
|
| // visible, instead of overloading this one.
|
| int visible_icon_count_;
|
|
|
| + // Whether or not there is an active ExtensionMessageBubbleController
|
| + // associated with the profile. There should only be one at a time.
|
| + bool has_active_bubble_;
|
| +
|
| ScopedObserver<extensions::ExtensionActionAPI,
|
| extensions::ExtensionActionAPI::Observer>
|
| extension_action_observer_;
|
|
|