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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 15695010: Add ProfileManager::AllowGetDefaultProfile() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix browsertest Created 7 years, 7 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 | chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc » ('j') | 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 bd2c00c2e2165c2c519725b4eea5d7f55c489c4f..04149e7dcff61cca445df7b5af15ad2bb2622f5f 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1252,6 +1252,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
browser_process_->profile_manager()->SetWillImport();
}
+ // Called before CreateProfile because creating the profile can trigger
+ // calls to GetDefaultProfile().
+ ProfileManager::AllowGetDefaultProfile();
+
profile_ = CreateProfile(parameters(), user_data_dir_, parsed_command_line());
if (!profile_)
return content::RESULT_CODE_NORMAL_EXIT;
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698