Make ExtensionBrowserEventRouter owned by ExtensionService....

chrome/browser/extensions/extension_browser_event_router.cc

 // Copyright (c) 2010 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/extension_event_names.h"
 #include "chrome/browser/extensions/extension_event_router.h"
@@ skipping 43 matching lines @@
       tab_keys::kStatusValueLoading);
 
   if (contents->GetURL() != url_) {
     url_ = contents->GetURL();
     changed_properties->SetString(tab_keys::kUrlKey, url_.spec());
   }
 
   return changed_properties;
 }
 
-ExtensionBrowserEventRouter* ExtensionBrowserEventRouter::GetInstance() {
-  return Singleton<ExtensionBrowserEventRouter>::get();
-}
-
 static void DispatchEvent(Profile* profile,
                           const char* event_name,
                           const std::string& json_args) {
   if (profile->GetExtensionEventRouter()) {
     profile->GetExtensionEventRouter()->DispatchEventToRenderers(
         event_name, json_args, profile, GURL());
   }
 }
 
 static void DispatchEventToExtension(Profile* profile,
@@ skipping 26 matching lines @@
                                        const char* event_name) {
   ListValue args;
   args.Append(Value::CreateIntegerValue(window_id));
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
 
   DispatchEvent(profile, event_name, json_args);
 }
 
-void ExtensionBrowserEventRouter::Init(Profile* profile) {
+void ExtensionBrowserEventRouter::Init() {
   if (initialized_)
     return;
-  DCHECK(!profile->IsOffTheRecord());
-  profile_ = profile;
   BrowserList::AddObserver(this);
 #if defined(TOOLKIT_VIEWS)
   views::FocusManager::GetWidgetFocusManager()->AddFocusChangeListener(this);
 #elif defined(TOOLKIT_GTK)
   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, NotificationType::NO_KEY_WINDOW,
                  NotificationService::AllSources());
@@ skipping 12 matching lines @@
         TabContents* contents = browser->GetTabContentsAt(i);
         int tab_id = ExtensionTabUtil::GetTabId(contents);
         tab_entries_[tab_id] = TabEntry();
       }
     }
   }
 
   initialized_ = true;
 }
 
-ExtensionBrowserEventRouter::ExtensionBrowserEventRouter()
+ExtensionBrowserEventRouter::ExtensionBrowserEventRouter(Profile* profile)
     : initialized_(false),
       focused_window_id_(extension_misc::kUnknownWindowId),
-      profile_(NULL) { }
+      profile_(profile) {
+  DCHECK(!profile->IsOffTheRecord());
+}
 
-ExtensionBrowserEventRouter::~ExtensionBrowserEventRouter() {}
+ExtensionBrowserEventRouter::~ExtensionBrowserEventRouter() {
+  BrowserList::RemoveObserver(this);
+#if defined(TOOLKIT_VIEWS)
+  views::FocusManager::GetWidgetFocusManager()->RemoveFocusChangeListener(this);
+#elif defined(TOOLKIT_GTK)
+  ActiveWindowWatcherX::RemoveObserver(this);
+#endif
+}
 
 void ExtensionBrowserEventRouter::OnBrowserAdded(const Browser* browser) {
   RegisterForBrowserNotifications(browser);
 }
 
 void ExtensionBrowserEventRouter::RegisterForBrowserNotifications(
     const Browser* browser) {
   // Start listening to TabStripModel events for this browser.
   browser->tabstrip_model()->AddObserver(this);
 
@@ skipping 367 matching lines @@
 
 void ExtensionBrowserEventRouter::BrowserActionExecuted(
     Profile* profile, const std::string& extension_id, Browser* browser) {
   TabContentsWrapper* tab_contents = NULL;
   int tab_id = 0;
   if (!ExtensionTabUtil::GetDefaultTab(browser, &tab_contents, &tab_id))
     return;
   DispatchEventWithTab(profile, extension_id, "browserAction.onClicked",
                        tab_contents->tab_contents());
 }