More System Dialog printing code disabled on Windows.

BUG=374321

Review URL: https://codereview.chromium.org/517193003

Cr-Commit-Position: refs/heads/master@{#292747}

chrome/browser/printing/print_view_manager.cc

@@ -46,10 +46,8 @@ PrintViewManager::~PrintViewManager() {
   DCHECK_EQ(NOT_PREVIEWING, print_preview_state_);
 }
 
+#if !defined(OS_WIN)
 bool PrintViewManager::PrintForSystemDialogNow() {
-#if defined(OS_WIN)
-  NOTREACHED();
-#endif
   return PrintNowInternal(new PrintMsg_PrintForSystemDialog(routing_id()));
 }
 
@@ -71,7 +69,7 @@ bool PrintViewManager::AdvancedPrintNow() {
     return PrintNow();
   }
 }
-
+#endif  // !OS_WIN
 bool PrintViewManager::PrintPreviewNow(bool selection_only) {
   // Users can send print commands all they want and it is beyond
   // PrintViewManager's control. Just ignore the extra commands.

chrome/browser/printing/print_view_manager.h

@@ -22,6 +22,7 @@ class PrintViewManager : public PrintViewManagerBase,
  public:
   virtual ~PrintViewManager();
 
+#if !defined(OS_WIN)
   // Same as PrintNow(), but for the case where a user prints with the system
   // dialog from print preview.
   bool PrintForSystemDialogNow();
@@ -30,6 +31,7 @@ class PrintViewManager : public PrintViewManagerBase,
   // show the native system dialog. This can happen from both initiator and
   // preview dialog.
   bool AdvancedPrintNow();
+#endif  // !OS_WIN
 
   // Initiate print preview of the current document by first notifying the
   // renderer. Since this happens asynchronous, the print preview dialog

chrome/browser/printing/print_view_manager_base.cc

@@ -75,9 +75,11 @@ PrintViewManagerBase::~PrintViewManagerBase() {
   DisconnectFromCurrentPrintJob();
 }
 
+#if !defined(OS_WIN)
 bool PrintViewManagerBase::PrintNow() {
   return PrintNowInternal(new PrintMsg_PrintPages(routing_id()));
 }
+#endif  // !OS_WIN
 
 void PrintViewManagerBase::UpdateScriptedPrintingBlocked() {
   Send(new PrintMsg_SetScriptedPrintingBlocked(

chrome/browser/printing/print_view_manager_base.h

@@ -35,10 +35,12 @@ class PrintViewManagerBase : public content::NotificationObserver,
  public:
   virtual ~PrintViewManagerBase();
 
+#if !defined(OS_WIN)
   // Prints the current document immediately. Since the rendering is
   // asynchronous, the actual printing will not be completed on the return of
   // this function. Returns false if printing is impossible at the moment.
   virtual bool PrintNow();
+#endif  // !OS_WIN
 
   // Whether to block scripted printing for our tab or not.
   void UpdateScriptedPrintingBlocked();

chrome/browser/ui/webui/print_preview/print_preview_handler.cc

@@ -566,9 +566,11 @@ void PrintPreviewHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("getPrinterCapabilities",
       base::Bind(&PrintPreviewHandler::HandleGetPrinterCapabilities,
                  base::Unretained(this)));
+#if !defined(OS_WIN)
   web_ui()->RegisterMessageCallback("showSystemDialog",
       base::Bind(&PrintPreviewHandler::HandleShowSystemDialog,
                  base::Unretained(this)));
+#endif  // !OS_WIN
   web_ui()->RegisterMessageCallback("signIn",
       base::Bind(&PrintPreviewHandler::HandleSignin,
                  base::Unretained(this)));
@@ -1022,6 +1024,7 @@ void PrintPreviewHandler::HandleManageCloudPrint(
       false));
 }
 
+#if !defined(OS_WIN)
 void PrintPreviewHandler::HandleShowSystemDialog(
     const base::ListValue* /*args*/) {
   ReportStats();
@@ -1041,6 +1044,7 @@ void PrintPreviewHandler::HandleShowSystemDialog(
       static_cast<PrintPreviewUI*>(web_ui()->GetController());
   print_preview_ui->OnCancelPendingPreviewRequest();
 }
+#endif  // !OS_WIN
 
 void PrintPreviewHandler::HandleManagePrinters(
     const base::ListValue* /*args*/) {
@@ -1286,9 +1290,11 @@ void PrintPreviewHandler::OnPrintPreviewFailed() {
   ReportUserActionHistogram(PREVIEW_FAILED);
 }
 
+#if !defined(OS_WIN)
 void PrintPreviewHandler::ShowSystemDialog() {
   HandleShowSystemDialog(NULL);
 }
+#endif  // !OS_WIN
 
 void PrintPreviewHandler::FileSelected(const base::FilePath& path,
                                        int index, void* params) {

chrome/browser/ui/webui/print_preview/print_preview_handler.h

@@ -79,9 +79,11 @@ class PrintPreviewHandler
   // Called when print preview failed.
   void OnPrintPreviewFailed();
 
+#if !defined(OS_WIN)
   // Called when the user press ctrl+shift+p to display the native system
   // dialog.
   void ShowSystemDialog();
+#endif  // !OS_WIN
 
 #if defined(ENABLE_SERVICE_DISCOVERY)
   // PrivetLocalPrinterLister::Delegate implementation.
@@ -149,9 +151,11 @@ class PrintPreviewHandler
   // Gets the printer capabilities. First element of |args| is the printer name.
   void HandleGetPrinterCapabilities(const base::ListValue* args);
 
+#if !defined(OS_WIN)
   // Asks the initiator renderer to show the native print system dialog. |args|
   // is unused.
   void HandleShowSystemDialog(const base::ListValue* args);
+#endif  // !OS_WIN
 
   // Callback for the signin dialog to call once signin is complete.
   void OnSigninComplete();

chrome/browser/ui/webui/print_preview/print_preview_ui.cc

@@ -483,9 +483,11 @@ void PrintPreviewUI::OnPrintPreviewRequest(int request_id) {
   g_print_preview_request_id_map.Get().Set(id_, request_id);
 }
 
+#if !defined(OS_WIN)
 void PrintPreviewUI::OnShowSystemDialog() {
   web_ui()->CallJavascriptFunction("onSystemDialogLinkClicked");
 }
+#endif  // !OS_WIN
 
 void PrintPreviewUI::OnDidGetPreviewPageCount(
     const PrintHostMsg_DidGetPreviewPageCount_Params& params) {

chrome/browser/ui/webui/print_preview/print_preview_ui.h

@@ -84,8 +84,10 @@ class PrintPreviewUI : public ConstrainedWebDialogUI {
   // Notifies the Web UI of a print preview request with |request_id|.
   void OnPrintPreviewRequest(int request_id);
 
+#if !defined(OS_WIN)
   // Notifies the Web UI to show the system dialog.
   void OnShowSystemDialog();
+#endif  // !OS_WIN
 
   // Notifies the Web UI about the page count of the request preview.
   void OnDidGetPreviewPageCount(

chrome/common/print_messages.h

@@ -318,10 +318,15 @@ IPC_MESSAGE_ROUTED0(PrintMsg_PrintNodeUnderContextMenu)
 IPC_MESSAGE_ROUTED1(PrintMsg_PrintForPrintPreview,
                     base::DictionaryValue /* settings */)
 
+#if !defined(OS_WIN)
 // Tells the render view to switch the CSS to print media type, renders every
 // requested pages and switch back the CSS to display media type.
 IPC_MESSAGE_ROUTED0(PrintMsg_PrintPages)
 
+// Like PrintMsg_PrintPages, but using the print preview document's frame/node.
+IPC_MESSAGE_ROUTED0(PrintMsg_PrintForSystemDialog)
+#endif  // !OS_WIN
+
 // Tells the render view that printing is done so it can clean up.
 IPC_MESSAGE_ROUTED1(PrintMsg_PrintingDone,
                     bool /* success */)
@@ -336,9 +341,6 @@ IPC_MESSAGE_ROUTED1(PrintMsg_SetScriptedPrintingBlocked,
 IPC_MESSAGE_ROUTED1(PrintMsg_PrintPreview,
                     base::DictionaryValue /* settings */)
 
-// Like PrintMsg_PrintPages, but using the print preview document's frame/node.
-IPC_MESSAGE_ROUTED0(PrintMsg_PrintForSystemDialog)
-
 // Messages sent from the renderer to the browser.
 
 #if defined(OS_WIN)

chrome/renderer/printing/print_web_view_helper.cc

@@ -834,8 +834,10 @@ void PrintWebViewHelper::PrintPage(blink::WebLocalFrame* frame,
 bool PrintWebViewHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PrintWebViewHelper, message)
+#if !defined(OS_WIN)
     IPC_MESSAGE_HANDLER(PrintMsg_PrintPages, OnPrintPages)
     IPC_MESSAGE_HANDLER(PrintMsg_PrintForSystemDialog, OnPrintForSystemDialog)
+#endif  // !OS_WIN
     IPC_MESSAGE_HANDLER(PrintMsg_InitiatePrintPreview, OnInitiatePrintPreview)
     IPC_MESSAGE_HANDLER(PrintMsg_PrintPreview, OnPrintPreview)
     IPC_MESSAGE_HANDLER(PrintMsg_PrintForPrintPreview, OnPrintForPrintPreview)
@@ -932,6 +934,7 @@ bool PrintWebViewHelper::GetPrintFrame(blink::WebLocalFrame** frame) {
   return true;
 }
 
+#if !defined(OS_WIN)
 void PrintWebViewHelper::OnPrintPages() {
   blink::WebLocalFrame* frame;
   if (GetPrintFrame(&frame))
@@ -944,9 +947,9 @@ void PrintWebViewHelper::OnPrintForSystemDialog() {
     NOTREACHED();
     return;
   }
-
   Print(frame, print_preview_context_.source_node());
 }
+#endif  // !OS_WIN
 
 void PrintWebViewHelper::GetPageSizeAndContentAreaFromPageLayout(
     const PageSizeMargins& page_layout_in_points,
@@ -1223,6 +1226,7 @@ void PrintWebViewHelper::PrintNode(const blink::WebNode& node) {
   print_node_in_progress_ = false;
 }
 
+#if !defined(OS_WIN)
 void PrintWebViewHelper::Print(blink::WebLocalFrame* frame,
                                const blink::WebNode& node) {
   // If still not finished with earlier print request simply ignore.
@@ -1256,6 +1260,7 @@ void PrintWebViewHelper::Print(blink::WebLocalFrame* frame,
     DidFinishPrinting(FAIL_PRINT);
   }
 }
+#endif  // !OS_WIN
 
 void PrintWebViewHelper::DidFinishPrinting(PrintingResult result) {
   switch (result) {

chrome/renderer/printing/print_web_view_helper.h

@@ -118,8 +118,10 @@ class PrintWebViewHelper
   virtual void DidStopLoading() OVERRIDE;
 
   // Message handlers ---------------------------------------------------------
+#if !defined(OS_WIN)
   void OnPrintPages();
   void OnPrintForSystemDialog();
+#endif  // !OS_WIN
   void OnInitiatePrintPreview(bool selection_only);
   void OnPrintPreview(const base::DictionaryValue& settings);
   void OnPrintForPrintPreview(const base::DictionaryValue& job_settings);

chrome/renderer/printing/print_web_view_helper_browsertest.cc

@@ -188,10 +188,13 @@ class PrintWebViewHelperTestBase : public ChromeRenderViewTest {
     }
 #endif  // defined(OS_CHROMEOS)
   }
+
+#if !defined(OS_WIN)
   void OnPrintPages() {
     PrintWebViewHelper::Get(view_)->OnPrintPages();
     ProcessPendingMessages();
   }
+#endif  // !OS_WIN
 
   void VerifyPreviewRequest(bool requested) {
     const IPC::Message* print_msg =
@@ -233,6 +236,7 @@ class PrintWebViewHelperTest : public PrintWebViewHelperTestBase {
   DISALLOW_COPY_AND_ASSIGN(PrintWebViewHelperTest);
 };
 
+#if !defined(OS_WIN)
 // Tests that printing pages work and sending and receiving messages through
 // that channel all works.
 TEST_F(PrintWebViewHelperTest, OnPrintPages) {
@@ -242,8 +246,9 @@ TEST_F(PrintWebViewHelperTest, OnPrintPages) {
   VerifyPageCount(1);
   VerifyPagesPrinted(true);
 }
+#endif  // !OS_WIN
 
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) && !defined(OS_WIN)
 // TODO(estade): I don't think this test is worth porting to Linux. We will have
 // to rip out and replace most of the IPC code if we ever plan to improve
 // printing, and the comment below by sverrir suggests that it doesn't do much
@@ -284,7 +289,7 @@ TEST_F(PrintWebViewHelperTest, PrintWithIframe) {
   EXPECT_NE(0, image1.size().width());
   EXPECT_NE(0, image1.size().height());
 }
-#endif  // OS_MACOSX
+#endif  // OS_MACOSX && !OS_WIN
 
 // Tests if we can print a page and verify its results.
 // This test prints HTML pages into a pseudo printer and check their outputs,
@@ -330,7 +335,7 @@ const TestPageData kTestPages[] = {
 // hooking up Cairo to read a pdf stream, or accessing the cairo surface in the
 // metafile directly.
 // Same for printing via PDF on Windows.
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) && !defined(OS_WIN)
 TEST_F(PrintWebViewHelperTest, PrintLayoutTest) {
   bool baseline = false;
 
@@ -383,7 +388,7 @@ TEST_F(PrintWebViewHelperTest, PrintLayoutTest) {
     }
   }
 }
-#endif  // OS_MACOSX
+#endif  // OS_MACOSX && !OS_WIN
 
 // These print preview tests do not work on Chrome OS yet.
 #if !defined(OS_CHROMEOS)