| Index: chrome/browser/ui/webui/print_preview/print_preview_handler.h
|
| diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.h b/chrome/browser/ui/webui/print_preview/print_preview_handler.h
|
| index 5d19a46ab5fe797f278729fef246927205e1b422..2d876f5a7c26e1fb6225535d065fd369eed2dd7b 100644
|
| --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.h
|
| +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.h
|
| @@ -22,7 +22,7 @@
|
| #if defined(ENABLE_SERVICE_DISCOVERY)
|
| #include "chrome/browser/local_discovery/privet_local_printer_lister.h"
|
| #include "chrome/browser/local_discovery/service_discovery_shared_client.h"
|
| -#endif // ENABLE_SERVICE_DISCOVERY
|
| +#endif // defined(ENABLE_SERVICE_DISCOVERY)
|
|
|
| class PrinterHandler;
|
| class PrintPreviewUI;
|
| @@ -84,7 +84,7 @@ class PrintPreviewHandler
|
| // Called when the user press ctrl+shift+p to display the native system
|
| // dialog.
|
| void ShowSystemDialog();
|
| -#endif // ENABLE_BASIC_PRINTING
|
| +#endif // defined(ENABLE_BASIC_PRINTING)
|
|
|
| #if defined(ENABLE_SERVICE_DISCOVERY)
|
| // PrivetLocalPrinterLister::Delegate implementation.
|
| @@ -102,7 +102,8 @@ class PrintPreviewHandler
|
| void OnPrivetPrintingError(
|
| const local_discovery::PrivetLocalPrintOperation* print_operation,
|
| int http_code) override;
|
| -#endif // ENABLE_SERVICE_DISCOVERY
|
| +#endif // defined(ENABLE_SERVICE_DISCOVERY)
|
| +
|
| int regenerate_preview_request_count() const {
|
| return regenerate_preview_request_count_;
|
| }
|
| @@ -164,7 +165,7 @@ class PrintPreviewHandler
|
| // Asks the initiator renderer to show the native print system dialog. |args|
|
| // is unused.
|
| void HandleShowSystemDialog(const base::ListValue* args);
|
| -#endif // ENABLE_BASIC_PRINTING
|
| +#endif // defined(ENABLE_BASIC_PRINTING)
|
|
|
| // Callback for the signin dialog to call once signin is complete.
|
| void OnSigninComplete();
|
| @@ -303,7 +304,7 @@ class PrintPreviewHandler
|
| const local_discovery::DeviceDescription& description,
|
| bool has_local_printing,
|
| base::DictionaryValue* printer_value);
|
| -#endif
|
| +#endif // defined(ENABLE_SERVICE_DISCOVERY)
|
|
|
| // Lazily creates |extension_printer_handler_| that can be used to handle
|
| // extension printers requests.
|
| @@ -382,7 +383,7 @@ class PrintPreviewHandler
|
| privet_capabilities_operation_;
|
| scoped_ptr<local_discovery::PrivetLocalPrintOperation>
|
| privet_local_print_operation_;
|
| -#endif
|
| +#endif // defined(ENABLE_SERVICE_DISCOVERY)
|
|
|
| // Handles requests for extension printers. Created lazily by calling
|
| // |EnsureExtensionPrinterHandlerSet|.
|
|
|