From cdb756ef72f012a5dd9361e316d03960bc18029e Mon Sep 17 00:00:00 2001 From: "yfriedman@chromium.org" Date: Thu, 5 Apr 2012 18:34:53 +0000 Subject: Allow SessionService to be disabled. Android manages persistence of sessions separately in Java code. BUG=117407 Review URL: http://codereview.chromium.org/9985002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130976 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/sessions/tab_restore_service.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'chrome/browser/sessions/tab_restore_service.cc') diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc index 2fee862..701b0a3 100644 --- a/chrome/browser/sessions/tab_restore_service.cc +++ b/chrome/browser/sessions/tab_restore_service.cc @@ -439,6 +439,11 @@ void TabRestoreService::LoadTabsFromLastSession() { if (load_state_ != NOT_LOADED || entries_.size() == kMaxEntries) return; +#if !defined(ENABLE_SESSION_SERVICE) + // If sessions are not stored in the SessionService, default to + // |LOADED_LAST_SESSION| state. + load_state_ = LOADING | LOADED_LAST_SESSION; +#else load_state_ = LOADING; SessionService* session_service = @@ -455,6 +460,7 @@ void TabRestoreService::LoadTabsFromLastSession() { } else { load_state_ |= LOADED_LAST_SESSION; } +#endif // Request the tabs closed in the last session. If the last session crashed, // this won't contain the tabs/window that were open at the point of the -- cgit v1.1