| Index: chrome/browser/ui/webui/print_preview/print_preview_handler.cc
|
| diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
|
| index 3fc1a13edeadf563ae804989cb5b7852475140a3..147b18db3a916b2289ca5b8401aa05fcb4a69ea1 100644
|
| --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
|
| +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
|
| @@ -55,6 +55,7 @@
|
| #include "chrome/common/cloud_print/cloud_print_cdd_conversion.h"
|
| #include "chrome/common/cloud_print/cloud_print_constants.h"
|
| #include "chrome/common/crash_keys.h"
|
| +#include "chrome/common/features.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "components/cloud_devices/common/cloud_device_description.h"
|
| #include "components/cloud_devices/common/cloud_devices_urls.h"
|
| @@ -609,11 +610,11 @@ void PrintPreviewHandler::RegisterMessages() {
|
| web_ui()->RegisterMessageCallback("getPrinterCapabilities",
|
| base::Bind(&PrintPreviewHandler::HandleGetPrinterCapabilities,
|
| base::Unretained(this)));
|
| -#if defined(ENABLE_BASIC_PRINTING)
|
| +#if BUILDFLAG(ENABLE_BASIC_PRINT_DIALOG)
|
| web_ui()->RegisterMessageCallback("showSystemDialog",
|
| base::Bind(&PrintPreviewHandler::HandleShowSystemDialog,
|
| base::Unretained(this)));
|
| -#endif // ENABLE_BASIC_PRINTING
|
| +#endif
|
| web_ui()->RegisterMessageCallback("signIn",
|
| base::Bind(&PrintPreviewHandler::HandleSignin,
|
| base::Unretained(this)));
|
| @@ -1145,7 +1146,7 @@ void PrintPreviewHandler::HandleManageCloudPrint(
|
| ui::PAGE_TRANSITION_LINK, false));
|
| }
|
|
|
| -#if defined(ENABLE_BASIC_PRINTING)
|
| +#if BUILDFLAG(ENABLE_BASIC_PRINT_DIALOG)
|
| void PrintPreviewHandler::HandleShowSystemDialog(
|
| const base::ListValue* /*args*/) {
|
| ReportStats();
|
| @@ -1164,7 +1165,7 @@ void PrintPreviewHandler::HandleShowSystemDialog(
|
| // Cancel the pending preview request if exists.
|
| print_preview_ui()->OnCancelPendingPreviewRequest();
|
| }
|
| -#endif // ENABLE_BASIC_PRINTING
|
| +#endif
|
|
|
| void PrintPreviewHandler::HandleManagePrinters(
|
| const base::ListValue* /*args*/) {
|
| @@ -1411,11 +1412,11 @@ void PrintPreviewHandler::OnPrintPreviewFailed() {
|
| ReportUserActionHistogram(PREVIEW_FAILED);
|
| }
|
|
|
| -#if defined(ENABLE_BASIC_PRINTING)
|
| +#if BUILDFLAG(ENABLE_BASIC_PRINT_DIALOG)
|
| void PrintPreviewHandler::ShowSystemDialog() {
|
| HandleShowSystemDialog(NULL);
|
| }
|
| -#endif // ENABLE_BASIC_PRINTING
|
| +#endif
|
|
|
| void PrintPreviewHandler::FileSelected(const base::FilePath& path,
|
| int /* index */,
|
|
|