diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 19:42:33 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 19:42:33 +0000 |
| commit | 91451171aa98b6e44238517f39fc58a86028d75d (patch) | |
| tree | a67533d2bffddf114314e8e7235a5591c21233b7 /chrome/browser/browser_main.cc | |
| parent | 3a4f359fc1413e816423d137e7dc67abd8db5921 (diff) | |
| download | chromium_src-91451171aa98b6e44238517f39fc58a86028d75d.zip chromium_src-91451171aa98b6e44238517f39fc58a86028d75d.tar.gz chromium_src-91451171aa98b6e44238517f39fc58a86028d75d.tar.bz2 | |
Fix bug when accessing g_browser_process->broker_services() at shutdown.
BUG=28501
Review URL: http://codereview.chromium.org/435001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 53274e2..6ede0da 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -356,7 +356,7 @@ int BrowserMain(const MainFunctionParams& parameters) { bool is_first_run = FirstRun::IsChromeFirstRun() || parsed_command_line.HasSwitch(switches::kFirstRun); - scoped_ptr<BrowserProcess> browser_process; + scoped_ptr<BrowserProcessImpl> browser_process; if (parsed_command_line.HasSwitch(switches::kImport)) { // We use different BrowserProcess when importing so no GoogleURLTracker is // instantiated (as it makes a URLRequest and we don't have an IO thread, @@ -633,6 +633,7 @@ int BrowserMain(const MainFunctionParams& parameters) { // Note: must be done before FirstRun code is started. browser_process->db_thread(); browser_process->file_thread(); + browser_process->process_launcher_thread(); browser_process->io_thread(); // Importing other browser settings is done in a browser-like process |