Make ExtensionBrowserEventRouter owned by ExtensionService....

chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc

 // Copyright (c) 2011 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/gtk/browser_actions_toolbar_gtk.h"
 
+#include <algorithm>
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/gtk/cairo_cached_surface.h"
 #include "chrome/browser/gtk/extension_popup_gtk.h"
@@ skipping 253 matching lines @@
     action->button_->SetPaintOverride(GTK_STATE_ACTIVE);
     action->GetContextMenu()->Popup(widget, event);
 
     return TRUE;
   }
 
   static void OnClicked(GtkWidget* widget, BrowserActionButton* action) {
     if (action->ShowPopup(false))
       return;
 
-    ExtensionBrowserEventRouter::GetInstance()->BrowserActionExecuted(
+    ExtensionService* service =
+        action->toolbar_->browser()->profile()->GetExtensionService();
+    service->browser_event_router()->BrowserActionExecuted(
         action->toolbar_->browser()->profile(), action->extension_->id(),
         action->toolbar_->browser());
   }
 
   static gboolean OnExposeEvent(GtkWidget* widget,
                                 GdkEventExpose* event,
                                 BrowserActionButton* button) {
     int tab_id = button->toolbar_->GetCurrentTabId();
     if (tab_id < 0)
       return FALSE;
@@ skipping 70 matching lines @@
       drop_index_(-1),
       resize_animation_(this),
       desired_width_(0),
       start_width_(0),
       method_factory_(this) {
   ExtensionService* extension_service = profile_->GetExtensionService();
   // The |extension_service| can be NULL in Incognito.
   if (!extension_service)
     return;
 
- overflow_button_.reset(new CustomDrawButton(
+  overflow_button_.reset(new CustomDrawButton(
       theme_provider_,
       IDR_BROWSER_ACTIONS_OVERFLOW,
       IDR_BROWSER_ACTIONS_OVERFLOW_P,
       IDR_BROWSER_ACTIONS_OVERFLOW_H,
       0,
       gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE)));
 
   GtkWidget* gripper = gtk_button_new();
   gtk_widget_set_size_request(gripper, kResizeGripperWidth, -1);
   GTK_WIDGET_UNSET_FLAGS(gripper, GTK_CAN_FOCUS);
@@ skipping 291 matching lines @@
     NOTREACHED() << "No current tab.";
     return;
   }
 
   if (browser_action->HasPopup(tab_id)) {
     ExtensionPopupGtk::Show(
         browser_action->GetPopupUrl(tab_id), browser(),
         chevron(),
         false);
   } else {
-    ExtensionBrowserEventRouter::GetInstance()->BrowserActionExecuted(
+    ExtensionService* service = browser()->profile()->GetExtensionService();
+    service->browser_event_router()->BrowserActionExecuted(
         browser()->profile(), extension->id(), browser());
   }
 }
 
 void BrowserActionsToolbarGtk::StoppedShowing() {
   overflow_button_->UnsetPaintOverride();
 }
 
 bool BrowserActionsToolbarGtk::AlwaysShowIconForCmd(int command_id) const {
   return true;
@@ skipping 242 matching lines @@
   }
 
   it->second.get()->GetContextMenu()->PopupAsContext(event->time);
   return TRUE;
 }
 
 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) {
   if (!resize_animation_.is_animating())
     UpdateChevronVisibility();
 }