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

Unified Diff: chrome/browser/browser_shutdown.cc

Issue 552703002: Fix compilation on Windows with enable_printing=2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mon Sep 8 17:26:04 PDT 2014 Created 6 years, 3 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 | « chrome/browser/apps/app_browsertest.cc ('k') | chrome/browser/local_discovery/privet_http.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_shutdown.cc
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index a07f69109ce94946a512ff516bcc182af44bbbce..eaad0042ff452fc86fd90a8f7b7e2a51ef01d2c5 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -24,7 +24,6 @@
#include "chrome/browser/first_run/upgrade_util.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/service_process/service_process_control.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/crash_keys.h"
@@ -47,6 +46,10 @@
#include "chrome/browser/chromeos/boot_times_loader.h"
#endif
+#if defined(ENABLE_FULL_PRINTING)
+#include "chrome/browser/service_process/service_process_control.h"
+#endif
+
using base::Time;
using base::TimeDelta;
using content::BrowserThread;
@@ -140,9 +143,10 @@ bool ShutdownPreThreadsStop() {
chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker(
"BrowserShutdownStarted", false);
#endif
-
+#if defined(ENABLE_FULL_PRINTING)
// Shutdown the IPC channel to the service processes.
ServiceProcessControl::GetInstance()->Disconnect();
+#endif // ENABLE_FULL_PRINTING
// 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,
« no previous file with comments | « chrome/browser/apps/app_browsertest.cc ('k') | chrome/browser/local_discovery/privet_http.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698