diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 18:34:53 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 18:34:53 +0000 |
| commit | cdb756ef72f012a5dd9361e316d03960bc18029e (patch) | |
| tree | 17db17336ed4b941a3602e7b1ea96a77d5838e57 /chrome/browser/sessions/tab_restore_service.cc | |
| parent | 4b4e6aa376e9674fa659942cb703494a6e0846f1 (diff) | |
| download | chromium_src-cdb756ef72f012a5dd9361e316d03960bc18029e.zip chromium_src-cdb756ef72f012a5dd9361e316d03960bc18029e.tar.gz chromium_src-cdb756ef72f012a5dd9361e316d03960bc18029e.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/sessions/tab_restore_service.cc')
| -rw-r--r-- | chrome/browser/sessions/tab_restore_service.cc | 6 |
1 files changed, 6 insertions, 0 deletions
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 |