Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1138)

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 8429006: [cros] Fix regression with user profile being loaded before profile dir is mounted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 2d9576fb4caba2f4d4921c29a121a83c2f2ab12c..a0ad674599136715295772db7ad3e334b2084eb6 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698