| Index: chrome/browser/ui/toolbar/toolbar_actions_bar.h
|
| diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar.h b/chrome/browser/ui/toolbar/toolbar_actions_bar.h
|
| index 3a6798fc29a10a08f7d57583cb485b201263c7ec..349736cbde1ecfea49466fe991ad0943f3650d48 100644
|
| --- a/chrome/browser/ui/toolbar/toolbar_actions_bar.h
|
| +++ b/chrome/browser/ui/toolbar/toolbar_actions_bar.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_vector.h"
|
| +#include "base/memory/weak_ptr.h"
|
| #include "base/scoped_observer.h"
|
| #include "chrome/browser/extensions/extension_toolbar_model.h"
|
| #include "chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h"
|
| @@ -198,6 +199,9 @@ class ToolbarActionsBar : public extensions::ExtensionToolbarModel::Observer,
|
| // Sets |overflowed_action_wants_to_run_| to the proper value.
|
| void SetOverflowedActionWantsToRun();
|
|
|
| + // Shows an extension message bubble, if any should be shown.
|
| + void MaybeShowExtensionBubble();
|
| +
|
| bool in_overflow_mode() const { return main_bar_ != nullptr; }
|
|
|
| // The delegate for this object (in a real build, this is the view).
|
| @@ -247,6 +251,12 @@ class ToolbarActionsBar : public extensions::ExtensionToolbarModel::Observer,
|
| // True if an action in the overflow menu wants to run.
|
| bool overflowed_action_wants_to_run_;
|
|
|
| + // True if we have checked to see if there is an extension bubble that should
|
| + // be displayed, and, if there is, shown that bubble.
|
| + bool checked_extension_bubble_;
|
| +
|
| + base::WeakPtrFactory<ToolbarActionsBar> weak_ptr_factory_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBar);
|
| };
|
|
|
|
|