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

chrome/browser/extensions/extension_browser_event_router.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/extension_action/extension_page_actions_api_constants.h"
 #include "chrome/browser/extensions/extension_event_names.h"
@@ skipping 54 matching lines @@
       tab_keys::kStatusValueLoading);
 
   if (contents->GetURL() != url_) {
     url_ = contents->GetURL();
     changed_properties->SetString(tab_keys::kUrlKey, url_.spec());
   }
 
   return changed_properties;
 }
 
-void ExtensionBrowserEventRouter::Init(ExtensionToolbarModel* model) {
+void ExtensionBrowserEventRouter::Init() {
   if (initialized_)
     return;
-  model->AddObserver(this);
   BrowserList::AddObserver(this);
 #if defined(TOOLKIT_VIEWS)
   views::WidgetFocusManager::GetInstance()->AddFocusChangeListener(this);
 #elif defined(TOOLKIT_GTK)
   ui::ActiveWindowWatcherX::AddObserver(this);
 #elif defined(OS_MACOSX)
   // Needed for when no suitable window can be passed to an extension as the
   // currently focused window.
   registrar_.Add(this, content::NOTIFICATION_NO_KEY_WINDOW,
                  content::NotificationService::AllSources());
@@ skipping 605 matching lines @@
   }
 
   if (event_name) {
     DispatchEventWithTab(profile,
                          extension_id,
                          event_name,
                          tab_contents->web_contents(),
                          true);
   }
 }