| 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 8bea70d04804b35c48d152e4fe808f94348222ca..9343b4136a1c2a0e37fa94cacb9d39a3bcee4227 100644
|
| --- a/chrome/browser/ui/toolbar/toolbar_actions_bar.h
|
| +++ b/chrome/browser/ui/toolbar/toolbar_actions_bar.h
|
| @@ -149,6 +149,12 @@ class ToolbarActionsBar : public extensions::ExtensionToolbarModel::Observer {
|
| // Hides the actively showing popup, if any.
|
| void HideActivePopup();
|
|
|
| + // Sets the active sidebar owner to be |sidebar_owner|.
|
| + void SetSidebarOwner(ToolbarActionViewController* sidebar_owner);
|
| +
|
| + // Hides the actively showing sidebar, if any.
|
| + void HideActiveSidebar();
|
| +
|
| // Returns the main (i.e., not overflow) controller for the given action.
|
| ToolbarActionViewController* GetMainControllerForAction(
|
| ToolbarActionViewController* action);
|
| @@ -250,6 +256,10 @@ class ToolbarActionsBar : public extensions::ExtensionToolbarModel::Observer {
|
| // from toolbar_actions_).
|
| ToolbarActionViewController* popup_owner_;
|
|
|
| + // The action that triggered the current sidebar (just a reference to an
|
| + // action from toolbar_actions_).
|
| + ToolbarActionViewController* sidebar_owner_;
|
| +
|
| ScopedObserver<extensions::ExtensionToolbarModel,
|
| extensions::ExtensionToolbarModel::Observer> model_observer_;
|
|
|
|
|