sync: take two for: "Added classes to enable session sync...

chrome/browser/sessions/session_restore.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/sessions/session_restore.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 280 matching lines @@
       delete this;
       return;
     }
 
     if (browser_) {
       registrar_.Add(this, NotificationType::BROWSER_CLOSED,
                      Source<Browser>(browser_));
     }
   }
 
+  void RestoreForeignSession(std::vector<SessionWindow*>* windows) {
+    tab_loader_.reset(new TabLoader());
+    // Create a browser instance to put the restored tabs in.
+    bool has_tabbed_browser = false;
+    for (std::vector<SessionWindow*>::iterator i = (*windows).begin();
+        i != (*windows).end(); ++i) {
+      Browser* browser = NULL;
+      if (!has_tabbed_browser && (*i)->type == Browser::TYPE_NORMAL)
+        has_tabbed_browser = true;
+      browser = new Browser(static_cast<Browser::Type>((*i)->type),
+          profile_);
+      browser->set_override_bounds((*i)->bounds);
+      browser->set_maximized_state((*i)->is_maximized ?
+          Browser::MAXIMIZED_STATE_MAXIMIZED :
+          Browser::MAXIMIZED_STATE_UNMAXIMIZED);
+      browser->CreateBrowserWindow();
+
+      // Restore and show the browser.
+      const int initial_tab_count = browser->tab_count();
+      RestoreTabsToBrowser(*(*i), browser);
+      ShowBrowser(browser, initial_tab_count,
+          (*i)->selected_tab_index);
+      NotifySessionServiceOfRestoredTabs(browser, initial_tab_count);
+      FinishedTabCreation(true, has_tabbed_browser);
+    }
+  }
+
   ~SessionRestoreImpl() {
     STLDeleteElements(&windows_);
     restoring = false;
   }
 
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     switch (type.value) {
       case NotificationType::BROWSER_CLOSED:
@@ skipping 296 matching lines @@
 void SessionRestore::RestoreSession(Profile* profile,
                                     Browser* browser,
                                     bool clobber_existing_window,
                                     bool always_create_tabbed_browser,
                                     const std::vector<GURL>& urls_to_open) {
   Restore(profile, browser, false, clobber_existing_window,
           always_create_tabbed_browser, urls_to_open);
 }
 
 // static
+void SessionRestore::RestoreForeignSessionWindows(Profile* profile,
+    std::vector<SessionWindow*>* windows) {
+  // Create a SessionRestore object to eventually restore the tabs.
+  std::vector<GURL> gurls;
+  SessionRestoreImpl restorer(profile,
+      static_cast<Browser*>(NULL), true, false, true, gurls);
+  restorer.RestoreForeignSession(windows);
+}
+
+// static
 void SessionRestore::RestoreSessionSynchronously(
     Profile* profile,
     const std::vector<GURL>& urls_to_open) {
   Restore(profile, NULL, true, false, true, urls_to_open);
 }
 
 // static
 bool SessionRestore::IsRestoring() {
   return restoring;
 }