Pull browser action click logic into ToolbarModelController, so that when I

chrome/browser/extensions/extension_browser_event_router.h

Index: chrome/browser/extensions/extension_browser_event_router.h
diff --git a/chrome/browser/extensions/extension_browser_event_router.h b/chrome/browser/extensions/extension_browser_event_router.h
index 0e6002ec842dbc94428097ae23051f7ee97da56d..030717d58f62a3f3490be3cb7646638486d1c30d 100644
--- a/chrome/browser/extensions/extension_browser_event_router.h
+++ b/chrome/browser/extensions/extension_browser_event_router.h
@@ -38,14 +38,13 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver,
                                     public ui::ActiveWindowWatcherXObserver,
 #endif
                                     public BrowserList::Observer,
-                                    public ExtensionToolbarModel::Observer,
                                     public content::NotificationObserver {
  public:
   explicit ExtensionBrowserEventRouter(Profile* profile);
   virtual ~ExtensionBrowserEventRouter();
 
   // Must be called once. Subsequent calls have no effect.
-  void Init(ExtensionToolbarModel* model);
+  void Init();
 
   // BrowserList::Observer
   virtual void OnBrowserAdded(Browser* browser) OVERRIDE;
@@ -97,6 +96,9 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver,
                           const std::string& url,
                           int button);
 
+  // Browser Action execute event.
+  void BrowserActionExecuted(const std::string& extension_id, Browser* browser);
+
   // A keyboard shortcut resulted in an extension command.
   void CommandExecuted(Profile* profile,
                        const std::string& extension_id,
@@ -114,10 +116,6 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver,
   // and Observe/NAV_ENTRY_COMMITTED.
   void TabUpdated(content::WebContents* contents, bool did_navigate);
 
-  // ExtensionToolbarModel::Observer. Browser Actions execute event.
-  virtual void BrowserActionExecuted(const std::string& extension_id,
-                                     Browser* browser) OVERRIDE;
-
   // The DispatchEvent methods forward events to the |profile|'s event router.
   // The ExtensionBrowserEventRouter listens to events for all profiles,
   // so we avoid duplication by dropping events destined for other profiles.