Revert "FBTF: Move the TabRestoreService::Observer into its own file."

chrome/browser/sessions/tab_restore_service.h

 // Copyright (c) 2006-2008 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_SESSIONS_TAB_RESTORE_SERVICE_H_
 #define CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_
 #pragma once
 
 #include <list>
 #include <set>
 #include <vector>
 
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "chrome/browser/sessions/base_session_service.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/session_types.h"
 
 class Browser;
 class NavigationController;
 class Profile;
 struct SessionWindow;
-class TabRestoreServiceObserver;
 
 // TabRestoreService is responsible for maintaining the most recently closed
 // tabs and windows. When a tab is closed
 // TabRestoreService::CreateHistoricalTab is invoked and a Tab is created to
 // represent the tab. Similarly, when a browser is closed, BrowserClosing is
 // invoked and a Window is created to represent the window.
 //
 // To restore a tab/window from the TabRestoreService invoke RestoreEntryById
 // or RestoreMostRecentEntry.
 //
 // To listen for changes to the set of entries managed by the TabRestoreService
 // add an observer.
 class TabRestoreService : public BaseSessionService {
  public:
+  // Observer is notified when the set of entries managed by TabRestoreService
+  // changes in some way.
+  class Observer {
+   public:
+    // Sent when the set of entries changes in some way.
+    virtual void TabRestoreServiceChanged(TabRestoreService* service) = 0;
+
+    // Sent to all remaining Observers when TabRestoreService's
+    // destructor is run.
+    virtual void TabRestoreServiceDestroyed(TabRestoreService* service) = 0;
+
+   protected:
+    virtual ~Observer() {}
+  };
+
   // Interface used to allow the test to provide a custom time.
   class TimeFactory {
    public:
     virtual ~TimeFactory();
     virtual base::Time TimeNow() = 0;
   };
 
   // The type of entry.
   enum Type {
     TAB,
@@ skipping 63 matching lines @@
   typedef std::list<Entry*> Entries;
 
   // Creates a new TabRestoreService and provides an object that provides the
   // current time. The TabRestoreService does not take ownership of the
   // |time_factory_|.
   explicit TabRestoreService(Profile* profile,
                              TimeFactory* time_factory_ = NULL);
 
   // Adds/removes an observer. TabRestoreService does not take ownership of
   // the observer.
-  void AddObserver(TabRestoreServiceObserver* observer);
-  void RemoveObserver(TabRestoreServiceObserver* observer);
+  void AddObserver(Observer* observer);
+  void RemoveObserver(Observer* observer);
 
   // Creates a Tab to represent |tab| and notifies observers the list of
   // entries has changed.
   void CreateHistoricalTab(NavigationController* tab);
 
   // Invoked when a browser is closing. If |browser| is a tabbed browser with
   // at least one tab, a Window is created, added to entries and observers are
   // notified.
   void BrowserClosing(Browser* browser);
 
@@ skipping 174 matching lines @@
 
   // Have the max number of entries ever been created?
   bool reached_max_;
 
   // The number of entries to write.
   int entries_to_write_;
 
   // Number of entries we've written.
   int entries_written_;
 
-  ObserverList<TabRestoreServiceObserver> observer_list_;
+  ObserverList<Observer> observer_list_;
 
   // Set of tabs that we've received a BrowserClosing method for but no
   // corresponding BrowserClosed. We cache the set of browsers closing to
   // avoid creating historical tabs for them.
   std::set<Browser*> closing_browsers_;
 
   // Used when loading previous tabs/session.
   CancelableRequestConsumer load_consumer_;
 
   // Results from previously closed tabs/sessions is first added here. When
   // the results from both us and the session restore service have finished
   // loading LoadStateChanged is invoked, which adds these entries to
   // entries_.
   std::vector<Entry*> staging_entries_;
 
   TimeFactory* time_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TabRestoreService);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_