diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-06 19:30:19 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-06 19:30:19 +0000 |
| commit | 169627b81ce036a7014476c366b060e050b5ff70 (patch) | |
| tree | 6231d8cfaa065513b4742d99204b25da4178037a /chrome/browser/browser_init.cc | |
| parent | ee824a436efbdeed4ca78efc4dd2aa4976ba43a9 (diff) | |
| download | chromium_src-169627b81ce036a7014476c366b060e050b5ff70.zip chromium_src-169627b81ce036a7014476c366b060e050b5ff70.tar.gz chromium_src-169627b81ce036a7014476c366b060e050b5ff70.tar.bz2 | |
Makes the tab restore service persist closed tabs/windows to disk and
reload them when asked.
Sorry for largish looking change. It's made big by refactoring common
code between TabRestoreService and SessionService into a common
superclass. At the same time I removed some dead code and shuffled the
session related classes into a single directory for easier perusal.
BUG=384
TEST=close the browser, start the browser and make sure the new tab
page shows closed windows/tabs from the previous session.
Review URL: http://codereview.chromium.org/13152
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.cc')
| -rw-r--r-- | chrome/browser/browser_init.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index b56c0b38..6084a53 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -27,8 +27,8 @@ #include "chrome/browser/infobar_delegate.h" #include "chrome/browser/navigation_controller.h" #include "chrome/browser/net/dns_global.h" -#include "chrome/browser/session_restore.h" #include "chrome/browser/session_startup_pref.h" +#include "chrome/browser/sessions/session_restore.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/url_fixer_upper.h" #include "chrome/browser/web_app_launcher.h" @@ -76,7 +76,7 @@ class SessionCrashedInfoBarDelegate : public ConfirmInfoBarDelegate { } virtual bool Accept() { // Restore the session. - SessionRestore::RestoreSession(profile_, NULL, false, true, false, + SessionRestore::RestoreSession(profile_, NULL, true, false, std::vector<GURL>()); return true; } @@ -507,8 +507,7 @@ bool BrowserInit::LaunchWithProfile::OpenStartupURLs( // infobar. return false; } - SessionRestore::RestoreSessionSynchronously(profile_, false, - urls_to_open); + SessionRestore::RestoreSessionSynchronously(profile_, urls_to_open); return true; case SessionStartupPref::URLS: |