Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

chrome/browser/sessions/tab_restore_service.h

 // Copyright (c) 2011 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/gtest_prod_util.h"
 #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"
 #include "content/browser/in_process_webkit/session_storage_namespace.h"
 #include "webkit/glue/window_open_disposition.h"
 
-class NavigationController;
 class Profile;
 class TabRestoreServiceDelegate;
 class TabRestoreServiceObserver;
 struct SessionWindow;
 
+namespace content {
+class NavigationController;
+}
+
 // 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
@@ skipping 85 matching lines @@
 
   virtual ~TabRestoreService();
 
   // Adds/removes an observer. TabRestoreService does not take ownership of
   // the observer.
   void AddObserver(TabRestoreServiceObserver* observer);
   void RemoveObserver(TabRestoreServiceObserver* observer);
 
   // Creates a Tab to represent |tab| and notifies observers the list of
   // entries has changed.
-  void CreateHistoricalTab(NavigationController* tab, int index);
+  void CreateHistoricalTab(content::NavigationController* tab, int index);
 
   // Invoked when a browser is closing. If |delegate| is a tabbed browser with
   // at least one tab, a Window is created, added to entries and observers are
   // notified.
   void BrowserClosing(TabRestoreServiceDelegate* delegate);
 
   // Invoked when the browser is done closing.
   void BrowserClosed(TabRestoreServiceDelegate* delegate);
 
   // Removes all entries from the list and notifies observers the list
@@ skipping 53 matching lines @@
     // Indicates we finished loading the last session (but not necessarily the
     // last tabs).
     LOADED_LAST_SESSION  = 1 << 4
   };
 
   // Populates the tab's navigations from the NavigationController, and its
   // browser_id and pinned state from the browser.
   void PopulateTab(Tab* tab,
                    int index,
                    TabRestoreServiceDelegate* delegate,
-                   NavigationController* controller);
+                   content::NavigationController* controller);
 
   // Notifies observers the tabs have changed.
   void NotifyTabsChanged();
 
   // Adds |entry| to the list of entries and takes ownership. If |prune| is true
   // |PruneAndNotify| is invoked. If |to_front| is true the entry is added to
   // the front, otherwise the back. Normal closes go to the front, but
   // tab/window closes from the previous session are added to the back.
   void AddEntry(Entry* entry, bool prune, bool to_front);
 
@@ skipping 140 matching lines @@
   // 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_