diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 17:48:51 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 17:48:51 +0000 |
| commit | a28837d332fc0dedab294881577cb636ca0386cd (patch) | |
| tree | 0726362606a9d0d0e04bfcf378c20a90985edc48 /chrome/browser/sessions | |
| parent | d01fbeeb62303eb624ba5c0a9e2fada510a79bd0 (diff) | |
| download | chromium_src-a28837d332fc0dedab294881577cb636ca0386cd.zip chromium_src-a28837d332fc0dedab294881577cb636ca0386cd.tar.gz chromium_src-a28837d332fc0dedab294881577cb636ca0386cd.tar.bz2 | |
Rename BrowserInit to StartupBrowserCreator, and move into startup subdir.
BUG=none
TEST=none
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/10356100
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
| -rw-r--r-- | chrome/browser/sessions/session_restore_browsertest.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/sessions/session_service.cc | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index 49684a7..b794959 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -17,7 +17,6 @@ #include "chrome/browser/sessions/tab_restore_service_factory.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_init.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc index f39ec70..193ecf6 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc @@ -27,9 +27,9 @@ #include "chrome/browser/sessions/session_restore.h" #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/tabs/tab_strip_model.h" -#include "chrome/browser/ui/browser_init.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/startup/startup_browser_creator.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" @@ -532,7 +532,7 @@ bool SessionService::ShouldNewWindowStartSession() { return false; #endif if (!has_open_trackable_browsers_ && - !BrowserInit::InSynchronousProfileLaunch() && + !StartupBrowserCreator::InSynchronousProfileLaunch() && !SessionRestore::IsRestoring(profile()) #if defined(OS_MACOSX) // On OSX, a new window should not start a new session if it was opened @@ -555,7 +555,7 @@ bool SessionService::RestoreIfNecessary(const std::vector<GURL>& urls_to_open, MoveCurrentSessionToLastSession(); move_on_new_browser_ = false; } - SessionStartupPref pref = BrowserInit::GetSessionStartupPref( + SessionStartupPref pref = StartupBrowserCreator::GetSessionStartupPref( *CommandLine::ForCurrentProcess(), profile()); if (pref.type == SessionStartupPref::LAST) { SessionRestore::RestoreSession( |