diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 15:17:36 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 15:17:36 +0000 |
| commit | a64ad24dc8c840f4cdde3c30120abb03e2a07043 (patch) | |
| tree | 642baffa5445ea857184ff5611a9bff1019b69c2 /chrome/browser/chrome_browser_main.cc | |
| parent | b7a1b663c75496fe1d734cf96abd43a8d13a92ce (diff) | |
| download | chromium_src-a64ad24dc8c840f4cdde3c30120abb03e2a07043.zip chromium_src-a64ad24dc8c840f4cdde3c30120abb03e2a07043.tar.gz chromium_src-a64ad24dc8c840f4cdde3c30120abb03e2a07043.tar.bz2 | |
Don't reopen profiles on cros. This caused a major regression, which blocks other testing. Committing this fix quickly, but will rework if marja says so.
BUG=chromium-os:25066
TEST=Manual, pending coming up with something that can test accurately
TBR= marja
Review URL: https://chromiumcodereview.appspot.com/9249007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index de3c9724..0136cc0 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -1729,8 +1729,15 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { // We are in regular browser boot sequence. Open initial tabs and enter the // main message loop. int result_code; +#if defined(OS_CHROMEOS) + // On ChromeOS multiple profiles doesn't apply, and will break if we load + // them this early as the cryptohome hasn't yet been mounted (which happens + // only once we log in. + std::vector<Profile*> last_opened_profiles; +#else std::vector<Profile*> last_opened_profiles = g_browser_process->profile_manager()->GetLastOpenedProfiles(); +#endif if (browser_init_->Start(parsed_command_line(), FilePath(), profile_, last_opened_profiles, &result_code)) { #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) |