Index: chrome/browser/browser_main.cc |
=================================================================== |
--- chrome/browser/browser_main.cc (revision 97857) |
+++ chrome/browser/browser_main.cc (working copy) |
@@ -1709,6 +1709,12 @@ |
} |
#endif |
+ if (is_first_run) { |
+ // Warn the ProfileManager that an import process will run, possibly |
+ // locking the WebDataService directory of the next Profile created. |
+ g_browser_process->profile_manager()->SetWillImport(true, NULL); |
+ } |
+ |
Profile* profile = CreateProfile(parameters, user_data_dir, |
parsed_command_line); |
if (!profile) |
@@ -1812,7 +1818,8 @@ |
} // if (!first_run_ui_bypass) |
Browser::SetNewHomePagePrefs(user_prefs); |
- } |
+ g_browser_process->profile_manager()->SetWillImport(false, profile); |
Yoyo Zhou
2011/08/25 16:34:03
Maybe this function should have a different name -
Miranda Callahan
2011/08/26 08:31:32
Yeah, I wasn't really happy with this either. I'll
|
+ } // if (is_first_run) |
// Sets things up so that if we crash from this point on, a dialog will |
// popup asking the user to restart chrome. It is done this late to avoid |