Remove Profile and HostDesktopType dependencies from core TabRestore code

chrome/browser/sessions/tab_restore_service.h

 // Copyright 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_SESSIONS_TAB_RESTORE_SERVICE_H_
 #define CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_
 
 #include <list>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
-#include "chrome/browser/ui/host_desktop.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/sessions/serialized_navigation_entry.h"
 #include "components/sessions/session_id.h"
 #include "components/sessions/session_types.h"
 #include "content/public/browser/session_storage_namespace.h"
 #include "ui/base/window_open_disposition.h"
 
 class TabRestoreServiceDelegate;
 class TabRestoreServiceObserver;
 
@@ skipping 122 matching lines @@
   // Removes all entries from the list and notifies observers the list
   // of tabs has changed.
   virtual void ClearEntries() = 0;
 
   // Returns the entries, ordered with most recently closed entries at the
   // front.
   virtual const Entries& entries() const = 0;
 
   // Restores the most recently closed entry. Does nothing if there are no
   // entries to restore. If the most recently restored entry is a tab, it is
-  // added to |delegate|. If a new browser needs to be created for this entry,
-  // it will be created on the desktop specified by |host_desktop_type|. Returns
-  // the WebContents of the restored tab(s).
+  // added to |delegate|. |host_desktop_type| is a value that is opaque to this
+  // class and will be used only to pass back to the embedder via
+  // TabRestoreServiceClient if necessary. Returns the WebContents of the
+  // restored tab(s).
   virtual std::vector<content::WebContents*> RestoreMostRecentEntry(
       TabRestoreServiceDelegate* delegate,
-      chrome::HostDesktopType host_desktop_type) = 0;
+      int host_desktop_type) = 0;
 
   // Removes the Tab with id |id| from the list and returns it; ownership is
   // passed to the caller.
   virtual Tab* RemoveTabEntryById(SessionID::id_type id) = 0;
 
   // Restores an entry by id. If there is no entry with an id matching |id|,
   // this does nothing. If |delegate| is NULL, this creates a new window for the
   // entry. |disposition| is respected, but the attributes (tabstrip index,
   // browser window) of the tab when it was closed will be respected if
-  // disposition is UNKNOWN. If a new browser needs to be created for this
-  // entry, it will be created on the desktop specified by |host_desktop_type|.
-  // Returns the WebContents of the restored tab(s).
+  // disposition is UNKNOWN.  |host_desktop_type| is a value that is opaque to
+  // this class and will be used only to pass back to the embedder via
+  // TabRestoreServiceClient if necessary.  Returns the WebContents of the
+  // restored tab(s).
   virtual std::vector<content::WebContents*> RestoreEntryById(
       TabRestoreServiceDelegate* delegate,
       SessionID::id_type id,
-      chrome::HostDesktopType host_desktop_type,
+      int host_desktop_type,
       WindowOpenDisposition disposition) = 0;
 
   // Loads the tabs and previous session. This does nothing if the tabs
   // from the previous session have already been loaded.
   virtual void LoadTabsFromLastSession() = 0;
 
   // Returns true if the tab entries have been loaded.
   virtual bool IsLoaded() const = 0;
 
   // Deletes the last session.
   virtual void DeleteLastSession() = 0;
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_