diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 20:35:29 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 20:35:29 +0000 |
| commit | cca567c6c2de778462d8659f5dec7f9a70667e95 (patch) | |
| tree | 01d9ab219497b7ce4c73b08c56bfe39e814f1926 /chrome/browser/browser_main.cc | |
| parent | c47836e30d254547e7cc3233b33e9499c77c2f38 (diff) | |
| download | chromium_src-cca567c6c2de778462d8659f5dec7f9a70667e95.zip chromium_src-cca567c6c2de778462d8659f5dec7f9a70667e95.tar.gz chromium_src-cca567c6c2de778462d8659f5dec7f9a70667e95.tar.bz2 | |
Merge 32832 - Fix bug when accessing g_browser_process>broker_services() at shutdown.
BUG=28501
Review URL: http://codereview.chromium.org/435001
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/431013
git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@32841 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 5b42ebd..0f9c49b 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -359,7 +359,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, @@ -636,6 +636,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 |