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

Unified Diff: chrome/browser/browser_main.cc

Issue 7717025: Do not initialize event routers in the Profile Import process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: add process restriction from first CL Created 9 years, 4 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/extensions/extension_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698