| 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 a0e1b7c0f400b455cbfc32ce192cd1fae583ae1b..6865651459d4df334e20a732b778dd8c07c0cad6 100644
|
| --- a/chrome/browser/ui/toolbar/toolbar_actions_bar.h
|
| +++ b/chrome/browser/ui/toolbar/toolbar_actions_bar.h
|
| @@ -166,6 +166,12 @@ class ToolbarActionsBar : public ToolbarActionsModel::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);
|
| @@ -264,6 +270,10 @@ class ToolbarActionsBar : public ToolbarActionsModel::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<ToolbarActionsModel, ToolbarActionsModel::Observer>
|
| model_observer_;
|
|
|
|
|