Move implementation of BrowserList onto an inner, instantiatable class, BrowserListImpl.

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>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/extensions/api/tabs/tabs.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #if defined(TOOLKIT_VIEWS)
 #include "ui/views/focus/widget_focus_manager.h"
 #elif defined(TOOLKIT_GTK)
 #include "ui/base/x/active_window_watcher_x_observer.h"
 #endif
 
 namespace content {
 class WebContents;
 }
 
 // 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 ui::ActiveWindowWatcherXObserver,
 #endif
-                                    public BrowserList::Observer,
+                                    public chrome::BrowserListObserver,
                                     public content::NotificationObserver {
  public:
   explicit ExtensionBrowserEventRouter(Profile* profile);
   virtual ~ExtensionBrowserEventRouter();
 
   // Must be called once. Subsequent calls have no effect.
   void Init();
 
-  // BrowserList::Observer
+  // chrome::BrowserListObserver
   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)
   virtual void ActiveWindowChanged(GdkWindow* active_window) OVERRIDE;
 #endif
 
   // Called from Observe() on BROWSER_WINDOW_READY (not a part of
-  // BrowserList::Observer).
+  // chrome::BrowserListObserver).
   void OnBrowserWindowReady(Browser* browser);
 
   // TabStripModelObserver
   virtual void TabInsertedAt(TabContents* contents, int index,
                              bool active) OVERRIDE;
   virtual void TabClosingAt(TabStripModel* tab_strip_model,
                             TabContents* contents,
                             int index) OVERRIDE;
   virtual void TabDetachedAt(TabContents* contents, int index) OVERRIDE;
   virtual void ActiveTabChanged(TabContents* old_contents,
@@ skipping 161 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_