Make ExtensionBrowserEventRouter owned by ExtensionService....

chrome/browser/extensions/extension_browser_event_router.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSER_EVENT_ROUTER_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSER_EVENT_ROUTER_H_
 #pragma once
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/singleton.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/tabs/tab_strip_model_observer.h"
 #include "chrome/common/notification_registrar.h"
 #if defined(TOOLKIT_VIEWS)
 #include "views/view.h"
 #include "views/focus/focus_manager.h"
 #elif defined(TOOLKIT_GTK)
 #include "app/active_window_watcher_x.h"
 #endif
 
 // The ExtensionBrowserEventRouter listens to Browser window & tab events
 // and routes them to listeners inside extension process renderers.
 // 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 ActiveWindowWatcherX::Observer,
 #endif
                                     public BrowserList::Observer,
                                     public NotificationObserver {
  public:
-  // Get Browser-Global instance.
-  static ExtensionBrowserEventRouter* GetInstance();
+  explicit ExtensionBrowserEventRouter(Profile* profile);
+  ~ExtensionBrowserEventRouter();
 
   // Must be called once. Subsequent calls have no effect.
-  void Init(Profile* profile);
+  void Init();
 
   // BrowserList::Observer
   virtual void OnBrowserAdded(const Browser* browser);
   virtual void OnBrowserRemoved(const Browser* browser);
   virtual void OnBrowserSetLastActive(const Browser* browser);
 
 #if defined(TOOLKIT_VIEWS)
   virtual void NativeFocusWillChange(gfx::NativeView focused_before,
                                      gfx::NativeView focused_now);
 #elif defined(TOOLKIT_GTK)
@@ skipping 68 matching lines @@
   // in for a browser.
   void RegisterForBrowserNotifications(const Browser* browser);
 
   // Register ourselves to receive the various notifications we are interested
   // in for a tab.
   void RegisterForTabNotifications(TabContents* contents);
 
   // Removes notifications added in RegisterForTabNotifications.
   void UnregisterForTabNotifications(TabContents* contents);
 
-  ExtensionBrowserEventRouter();
-  ~ExtensionBrowserEventRouter();
-  friend struct DefaultSingletonTraits<ExtensionBrowserEventRouter>;
-
   NotificationRegistrar registrar_;
 
   bool initialized_;
 
   // Maintain some information about known tabs, so we can:
   //
   //  - distinguish between tab creation and tab insertion
   //  - not send tab-detached after tab-removed
   //  - reduce the "noise" of TabChangedAt() when sending events to extensions
   class TabEntry {
@@ skipping 37 matching lines @@
   int focused_window_id_;
 
   // The main profile (non-OTR) profile which will be used to send events not
   // associated with any browser.
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionBrowserEventRouter);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSER_EVENT_ROUTER_H_