| Index: chrome/browser/browser_process_impl.cc
|
| diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
|
| index 6d52d5ca79edb1401bbfcee20e03f84c60e560b7..3066504299868e9104db0311eef627697415c292 100644
|
| --- a/chrome/browser/browser_process_impl.cc
|
| +++ b/chrome/browser/browser_process_impl.cc
|
| @@ -119,6 +119,7 @@
|
| #include "extensions/common/constants.h"
|
| #include "net/socket/client_socket_pool_manager.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| +#include "printing/features/features.h"
|
| #include "ui/base/idle/idle.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/message_center/message_center.h"
|
| @@ -214,7 +215,7 @@ BrowserProcessImpl::BrowserProcessImpl(
|
| g_browser_process = this;
|
| platform_part_.reset(new BrowserProcessPlatformPart());
|
|
|
| -#if defined(ENABLE_PRINTING)
|
| +#if BUILDFLAG(ENABLE_PRINTING)
|
| // Must be created after the NotificationService.
|
| print_job_manager_.reset(new printing::PrintJobManager);
|
| #endif
|
| @@ -677,7 +678,7 @@ printing::PrintJobManager* BrowserProcessImpl::print_job_manager() {
|
|
|
| printing::PrintPreviewDialogController*
|
| BrowserProcessImpl::print_preview_dialog_controller() {
|
| -#if defined(ENABLE_PRINT_PREVIEW)
|
| +#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
| DCHECK(CalledOnValidThread());
|
| if (!print_preview_dialog_controller_.get())
|
| CreatePrintPreviewDialogController();
|
| @@ -690,7 +691,7 @@ printing::PrintPreviewDialogController*
|
|
|
| printing::BackgroundPrintingManager*
|
| BrowserProcessImpl::background_printing_manager() {
|
| -#if defined(ENABLE_PRINT_PREVIEW)
|
| +#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
| DCHECK(CalledOnValidThread());
|
| if (!background_printing_manager_.get())
|
| CreateBackgroundPrintingManager();
|
| @@ -1158,7 +1159,7 @@ void BrowserProcessImpl::CreateStatusTray() {
|
| }
|
|
|
| void BrowserProcessImpl::CreatePrintPreviewDialogController() {
|
| -#if defined(ENABLE_PRINT_PREVIEW)
|
| +#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
| DCHECK(!print_preview_dialog_controller_);
|
| print_preview_dialog_controller_ =
|
| new printing::PrintPreviewDialogController();
|
| @@ -1168,7 +1169,7 @@ void BrowserProcessImpl::CreatePrintPreviewDialogController() {
|
| }
|
|
|
| void BrowserProcessImpl::CreateBackgroundPrintingManager() {
|
| -#if defined(ENABLE_PRINT_PREVIEW)
|
| +#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
| DCHECK(!background_printing_manager_);
|
| background_printing_manager_.reset(new printing::BackgroundPrintingManager());
|
| #else
|
| @@ -1312,7 +1313,7 @@ void BrowserProcessImpl::Unpin() {
|
| release_last_reference_callstack_ = base::debug::StackTrace();
|
|
|
| shutting_down_ = true;
|
| -#if defined(ENABLE_PRINTING)
|
| +#if BUILDFLAG(ENABLE_PRINTING)
|
| // Wait for the pending print jobs to finish. Don't do this later, since
|
| // this might cause a nested message loop to run, and we don't want pending
|
| // tasks to run once teardown has started.
|
|
|