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

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

Issue 1419603004: [Extensions Toolbar] Fix action pop out bug and views animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 67e976f1dcfdf6b0c3f72a01eb1cfa7088e4d27d..4b416991a2964f05f1a4d5be6a3f6e74f241dcb5 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_bar.h
+++ b/chrome/browser/ui/toolbar/toolbar_actions_bar.h
@@ -9,6 +9,7 @@
#include "base/macros.h"
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
+#include "base/observer_list.h"
#include "base/scoped_observer.h"
#include "chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h"
#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
@@ -25,6 +26,7 @@ class PrefRegistrySyncable;
}
class ToolbarActionsBarDelegate;
+class ToolbarActionsBarObserver;
class ToolbarActionViewController;
// A platform-independent version of the container for toolbar actions,
@@ -202,6 +204,10 @@ class ToolbarActionsBar : public ToolbarActionsModel::Observer {
ToolbarActionViewController* GetMainControllerForAction(
ToolbarActionViewController* action);
+ // Add or remove an observer.
+ void AddObserver(ToolbarActionsBarObserver* observer);
+ void RemoveObserver(ToolbarActionsBarObserver* observer);
+
// Returns the underlying toolbar actions, but does not order them. Primarily
// for use in testing.
const std::vector<ToolbarActionViewController*>& toolbar_actions_unordered()
@@ -323,6 +329,8 @@ class ToolbarActionsBar : public ToolbarActionsModel::Observer {
scoped_ptr<extensions::ExtensionMessageBubbleController>
pending_extension_bubble_controller_;
+ base::ObserverList<ToolbarActionsBarObserver> observers_;
+
base::WeakPtrFactory<ToolbarActionsBar> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBar);
« no previous file with comments | « chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm ('k') | chrome/browser/ui/toolbar/toolbar_actions_bar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698