Skip to content
This repository has been archived by the owner on Jan 4, 2019. It is now read-only.

Commit

Permalink
Add missing utility printing handler back
Browse files Browse the repository at this point in the history
  • Loading branch information
darkdh committed Mar 1, 2017
1 parent dcbdf36 commit 8ed07a8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion atom/app/atom_main_delegate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "content/public/common/content_switches.h"
#include "extensions/common/constants.h"
#include "extensions/features/features.h"
#include "printing/features/features.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_switches.h"
Expand Down Expand Up @@ -335,7 +336,7 @@ int AtomMainDelegate::RunProcess(
const std::string& process_type,
const content::MainFunctionParams& main_function_params) {
static const MainFunction kMainFunctions[] = {
#if defined(ENABLE_PRINT_PREVIEW) && !defined(CHROME_MULTIPLE_DLL_CHILD)
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(CHROME_MULTIPLE_DLL_CHILD)
{ switches::kServiceProcess, ServiceProcessMain },
#endif

Expand Down
9 changes: 5 additions & 4 deletions atom/utility/atom_content_utility_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "net/proxy/mojo_proxy_resolver_factory_impl.h"
#include "net/proxy/proxy_resolver_v8.h"
#include "printing/features/features.h"
#include "services/service_manager/public/cpp/interface_registry.h"

#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/common/extensions/chrome_extensions_client.h"
#include "extensions/utility/utility_handler.h"
#endif

#if defined(ENABLE_PRINT_PREVIEW) || \
(defined(ENABLE_BASIC_PRINTING) && defined(OS_WIN))
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) || \
(BUILDFLAG(ENABLE_BASIC_PRINTING) && defined(OS_WIN))
#include "chrome/utility/printing_handler.h"
#endif

Expand Down Expand Up @@ -78,8 +79,8 @@ AtomContentUtilityClient::AtomContentUtilityClient()
: filter_messages_(false) {
handlers_.push_back(new ProfileImportHandler());

#if defined(ENABLE_PRINT_PREVIEW) || \
(defined(ENABLE_BASIC_PRINTING) && defined(OS_WIN))
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) || \
(BUILDFLAG(ENABLE_BASIC_PRINTING) && defined(OS_WIN))
handlers_.push_back(new printing::PrintingHandler());
#endif
}
Expand Down

0 comments on commit 8ed07a8

Please sign in to comment.