diff options
| author | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 03:33:38 +0000 |
|---|---|---|
| committer | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 03:33:38 +0000 |
| commit | 4e8b123c149b2a1b80070f2dccd2c342ec147981 (patch) | |
| tree | 22d483bef82594e09b202f23bda00b864ba56476 /chrome/browser/browser_shutdown.cc | |
| parent | f535217b5fc3d569ac2f18fd2a5177a85e934239 (diff) | |
| download | chromium_src-4e8b123c149b2a1b80070f2dccd2c342ec147981.zip chromium_src-4e8b123c149b2a1b80070f2dccd2c342ec147981.tar.gz chromium_src-4e8b123c149b2a1b80070f2dccd2c342ec147981.tar.bz2 | |
The ServiceProcessControl class is now a singleton and is not keyed off the profile.
BUG=80170
TEST=Unit-tests, Cloud Print proxy.
Review URL: http://codereview.chromium.org/7074023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_shutdown.cc')
| -rw-r--r-- | chrome/browser/browser_shutdown.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index 81e4e28..0ab6675 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -28,7 +28,7 @@ #include "chrome/browser/plugin_updater.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/service/service_process_control_manager.h" +#include "chrome/browser/service/service_process_control.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/chrome_paths.h" @@ -124,8 +124,8 @@ void Shutdown() { // shutdown. base::ThreadRestrictions::SetIOAllowed(true); - // Shutdown all IPC channels to service processes. - ServiceProcessControlManager::GetInstance()->Shutdown(); + // Shutdown the IPC channel to the service processes. + ServiceProcessControl::GetInstance()->Disconnect(); #if defined(OS_CHROMEOS) // The system key event listener needs to be shut down earlier than when |