diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-14 22:53:35 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-14 22:53:35 +0000 |
| commit | 5e997eacfb2234633831d06c91859ee76af44468 (patch) | |
| tree | d01aaffe479e9bc4f4e9df665d8d4a5f2e829060 /chrome/browser/sessions | |
| parent | dda6fa35a307c5a77b85602159f434fd7c252836 (diff) | |
| download | chromium_src-5e997eacfb2234633831d06c91859ee76af44468.zip chromium_src-5e997eacfb2234633831d06c91859ee76af44468.tar.gz chromium_src-5e997eacfb2234633831d06c91859ee76af44468.tar.bz2 | |
Make session_restore.cc compile on Posix.
Review URL: http://codereview.chromium.org/21376
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
| -rw-r--r-- | chrome/browser/sessions/session_restore.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/sessions/session_service.cc | 2 |
2 files changed, 8 insertions, 3 deletions
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 |