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

chrome/browser/extensions/extension_browser_event_router.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSER_EVENT_ROUTER_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSER_EVENT_ROUTER_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 20 matching lines @@
 // ExtensionBrowserEventRouter listens to *all* events, but will only route
 // events from windows/tabs within a profile to extension processes in the same
 // profile.
 class ExtensionBrowserEventRouter : public TabStripModelObserver,
 #if defined(TOOLKIT_VIEWS)
                                     public views::WidgetFocusChangeListener,
 #elif defined(TOOLKIT_GTK)
                                     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;
   virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
   virtual void OnBrowserSetLastActive(Browser* browser) OVERRIDE;
 
 #if defined(TOOLKIT_VIEWS)
   virtual void OnNativeFocusChange(gfx::NativeView focused_before,
                                    gfx::NativeView focused_now) OVERRIDE;
 #elif defined(TOOLKIT_GTK)
@@ skipping 31 matching lines @@
   virtual void TabStripEmpty() OVERRIDE;
 
   // Page Action execute event.
   void PageActionExecuted(Profile* profile,
                           const std::string& extension_id,
                           const std::string& page_action_id,
                           int tab_id,
                           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,
                        const std::string& command);
 
   // content::NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
  private:
   // "Synthetic" event. Called from TabInsertedAt if new tab is detected.
   void TabCreatedAt(content::WebContents* contents, int index, bool active);
 
   // Internal processing of tab updated events. Is called by both TabChangedAt
   // 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.
   void DispatchEvent(Profile* profile,
                      const char* event_name,
                      const std::string& json_args);
 
   void DispatchEventToExtension(Profile* profile,
                                 const std::string& extension_id,
                                 const char* event_name,
@@ skipping 100 matching lines @@
   Profile* focused_profile_;
 
   // The currently focused window. We keep this so as to avoid sending multiple
   // windows.onFocusChanged events with the same windowId.
   int focused_window_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionBrowserEventRouter);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSER_EVENT_ROUTER_H_