summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_shutdown.cc
diff options
context:
space:
mode:
authorsanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 22:41:38 +0000
committersanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 22:41:38 +0000
commit23853660fc93d53681b6d4d5b2b71be56dee03b4 (patch)
treef4c3bb067d649b62079f3e38e25071e5ba4b9efd /chrome/browser/browser_shutdown.cc
parent1cc58eb6c60596263644daebd0a9c923ba7db2f4 (diff)
downloadchromium_src-23853660fc93d53681b6d4d5b2b71be56dee03b4.zip
chromium_src-23853660fc93d53681b6d4d5b2b71be56dee03b4.tar.gz
chromium_src-23853660fc93d53681b6d4d5b2b71be56dee03b4.tar.bz2
Moved the call to ServiceProcessControlManager::Shutdown to browser_shutdown::Shutdown.
BUG=None. TEST=None. Review URL: http://codereview.chromium.org/3562003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_shutdown.cc')
-rw-r--r--chrome/browser/browser_shutdown.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index 9231470..7f2e4a6 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -29,6 +29,7 @@
#include "chrome/browser/renderer_host/render_process_host.h"
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/renderer_host/render_widget_host.h"
+#include "chrome/browser/service/service_process_control_manager.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
@@ -103,6 +104,9 @@ void Shutdown() {
ChromeThread::IO, FROM_HERE,
NewRunnableFunction(&ChromePluginLib::UnloadAllPlugins));
+ // Shutdown all IPC channels to service processes.
+ ServiceProcessControlManager::instance()->Shutdown();
+
// WARNING: During logoff/shutdown (WM_ENDSESSION) we may not have enough
// time to get here. If you have something that *must* happen on end session,
// consider putting it in BrowserProcessImpl::EndSession.