Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(884)

Unified Diff: chrome/browser/ui/toolbar/toolbar_actions_bar.h

Issue 1168383002: Implement sidebar support for extension action popups Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix assertion failure at extension_view_host.cc Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_;
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_action_view_controller.h ('k') | chrome/browser/ui/toolbar/toolbar_actions_bar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698