Commit 484262fd authored by ivankr@chromium.org's avatar ivankr@chromium.org

[cros] Fix regression with user profile being loaded before profile dir is mounted.

BUG=chromium-os:22290
TEST=Manual: create a new user, sign in, then sign out again. No message 'Chrome didn't shutdown correctly...' should appear beneath the address bar.


Review URL: http://codereview.chromium.org/8429006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107994 0039d316-1c4b-4281-b951-d872f2087c98
parent b7996453
......@@ -423,8 +423,14 @@ Profile* CreateProfile(const MainFunctionParams& parameters,
parsed_command_line.GetSwitchValueASCII(
switches::kProfileDirectory));
}
#if defined(OS_CHROMEOS)
// TODO(ivankr): http://crbug.com/83792
profile = g_browser_process->profile_manager()->GetDefaultProfile(
user_data_dir);
#else
profile = g_browser_process->profile_manager()->GetLastUsedProfile(
user_data_dir);
#endif
if (profile)
return profile;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment