4 files changed, 9 insertions, 5 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index b144733..f8c17b9 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -745,7 +745,6 @@ if not env.Bit('windows'):
       'sandbox_policy.cc',
       'search_engines/template_url_fetcher.cc',
       'sessions/base_session_service.cc',
-      'sessions/session_restore.cc',
       'shell_integration.cc',
       'tab_contents/interstitial_page.cc',
       'tab_contents/native_ui_contents.cc',
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 7a8efbc..51541f4 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -21,6 +21,7 @@
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/session_startup_pref.h"
+#include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/net/url_fixer_upper.h"
@@ -40,7 +41,6 @@
 #include "grit/theme_resources.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/automation/automation_provider_list.h"
-#include "chrome/browser/sessions/session_restore.h"
 #include "chrome/common/resource_bundle.h"
 
 #include "chromium_strings.h"
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 331a152..bced7ae 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
+
 #include "chrome/browser/sessions/session_restore.h"
 
 #include <vector>
@@ -14,10 +16,13 @@
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 
+#if defined(OS_WIN)
+#include "chrome/browser/tab_contents/tab_contents.h"
+#endif
+
 namespace {
 
 // TabLoader ------------------------------------------------------------------
@@ -196,7 +201,7 @@ class SessionRestoreImpl : public NotificationObserver {
         urls_to_open_(urls_to_open) {
   }
 
-  void SessionRestoreImpl::Restore() {
+  void Restore() {
     SessionService* session_service = profile_->GetSessionService();
     DCHECK(session_service);
     SessionService::LastSessionCallback* callback =
diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc
index 9521a88..7e16b34 100644
--- a/chrome/browser/sessions/session_service.cc
+++ b/chrome/browser/sessions/session_service.cc
@@ -18,6 +18,7 @@
 #include "chrome/browser/session_startup_pref.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_command.h"
+#include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
@@ -27,7 +28,6 @@
 
 // TODO(port): Get rid of this section and finish porting.
 #if defined(OS_WIN)
-#include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/win_util.h"
 #endif