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

chrome/browser/ui/browser_list.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_UI_BROWSER_LIST_H_
 #define CHROME_BROWSER_UI_BROWSER_LIST_H_
 #pragma once
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "ui/gfx/native_widget_types.h"
 
 class Browser;
 class Profile;
 
 namespace browser {
 class BrowserActivityObserver;
 #if defined(OS_MACOSX)
 Browser* GetLastActiveBrowser();
 #endif
 #if defined(TOOLKIT_GTK)
 class ExtensionInstallDialog;
 #endif
 }
 
 namespace chrome {
+class BrowserListObserver;
 namespace internal {
 void NotifyNotDefaultBrowserCallback();
 }
 }
 
 #if defined(OS_CHROMEOS)
 namespace chromeos {
 class ScreenLocker;
 }
 #endif
 
 namespace content {
 class WebContents;
 }
 
 #if defined(USE_ASH)
 content::WebContents* GetActiveWebContents();
 #endif
 
 // Stores a list of all Browser objects.
 class BrowserList {
  public:
   typedef std::vector<Browser*> BrowserVector;
   typedef BrowserVector::iterator iterator;
   typedef BrowserVector::const_iterator const_iterator;
   typedef BrowserVector::const_reverse_iterator const_reverse_iterator;
 
-  // It is not allowed to change the global window list (add or remove any
-  // browser windows while handling observer callbacks.
-  class Observer {
-   public:
-    // Called immediately after a browser is added to the list
-    virtual void OnBrowserAdded(Browser* browser) {}
-
-    // Called immediately after a browser is removed from the list
-    virtual void OnBrowserRemoved(Browser* browser) {}
-
-    // Called immediately after a browser is set active (SetLastActive)
-    virtual void OnBrowserSetLastActive(Browser* browser) {}
-
-   protected:
-    virtual ~Observer() {}
-  };
-
   // Adds and removes browsers from the global list. The browser object should
   // be valid BEFORE these calls (for the benefit of observers), so notify and
   // THEN delete the object.
   static void AddBrowser(Browser* browser);
   static void RemoveBrowser(Browser* browser);
 
-  static void AddObserver(Observer* observer);
-  static void RemoveObserver(Observer* observer);
+  static void AddObserver(chrome::BrowserListObserver* observer);
+  static void RemoveObserver(chrome::BrowserListObserver* observer);
 
   // Called by Browser objects when their window is activated (focused).  This
   // allows us to determine what the last active Browser was.
   static void SetLastActive(Browser* browser);
 
   // Closes all browsers for |profile|.
   static void CloseAllBrowsersWithProfile(Profile* profile);
 
   // Browsers are added to the list before they have constructed windows,
   // so the |window()| member function may return NULL.
@@ skipping 46 matching lines @@
   // in the list.  If no Browsers exist, returns NULL.
   //
   // WARNING: this is NULL until a browser becomes active. If during startup
   // a browser does not become active (perhaps the user launches Chrome, then
   // clicks on another app before the first browser window appears) then this
   // returns NULL.
   // WARNING #2: this will always be NULL in unit tests run on the bots.
   // THIS FUNCTION IS PRIVATE AND NOT TO BE USED AS A REPLACEMENT FOR RELEVANT
   // CONTEXT.
   static Browser* GetLastActive();
-
-  // Helper method to remove a browser instance from a list of browsers
-  static void RemoveBrowserFrom(Browser* browser, BrowserVector* browser_list);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_LIST_H_