summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions/base_session_service.cc
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-14 23:19:47 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-14 23:19:47 +0000
commit926bfeb46656408f24eb4a5bb09368f4c88875d1 (patch)
tree786125ef6a8d66d6906cc4cc5375dc9bde77174b /chrome/browser/sessions/base_session_service.cc
parent518fdec3a07a94dc45d6e7e4ad1b529747dc03d3 (diff)
downloadchromium_src-926bfeb46656408f24eb4a5bb09368f4c88875d1.zip
chromium_src-926bfeb46656408f24eb4a5bb09368f4c88875d1.tar.gz
chromium_src-926bfeb46656408f24eb4a5bb09368f4c88875d1.tar.bz2
Make base_session_service.cc compile on Posix.
Review URL: http://codereview.chromium.org/21377 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions/base_session_service.cc')
-rw-r--r--chrome/browser/sessions/base_session_service.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc
index 5ab3282..48fd901 100644
--- a/chrome/browser/sessions/base_session_service.cc
+++ b/chrome/browser/sessions/base_session_service.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/base_session_service.h"
#include "base/pickle.h"
@@ -11,9 +13,13 @@
#include "chrome/browser/sessions/session_backend.h"
#include "chrome/browser/sessions/session_types.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/common/stl_util-inl.h"
+// TODO(port): Get rid of this section and finish porting.
+#if defined(OS_WIN)
+#include "chrome/browser/tab_contents/tab_contents.h"
+#endif
+
// InternalGetCommandsRequest -------------------------------------------------
BaseSessionService::InternalGetCommandsRequest::~InternalGetCommandsRequest() {
@@ -65,7 +71,9 @@ BaseSessionService::BaseSessionService(SessionType type,
: profile_(profile),
path_(path),
backend_thread_(NULL),
+#if defined(OS_WIN)
#pragma warning(suppress: 4355) // Okay to pass "this" here.
+#endif
save_factory_(this),
pending_reset_(false),
commands_since_reset_(0) {