Printing: Catch more error conditions and remove more cruft.

chrome/renderer/print_web_view_helper.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_RENDERER_PRINT_WEB_VIEW_HELPER_H_
 #define CHROME_RENDERER_PRINT_WEB_VIEW_HELPER_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 91 matching lines @@
                            BlockScriptInitiatedPrinting);
   FRIEND_TEST_ALL_PREFIXES(PrintWebViewHelperTest, OnPrintPages);
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   FRIEND_TEST_ALL_PREFIXES(PrintWebViewHelperTest, PrintLayoutTest);
   FRIEND_TEST_ALL_PREFIXES(PrintWebViewHelperTest, PrintWithIframe);
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
   enum PrintingResult {
     OK,
+    FAIL_PRINT_INIT,
     FAIL_PRINT,
     FAIL_PREVIEW,
   };
 
   enum PrintPreviewErrorBuckets {
     PREVIEW_ERROR_NONE,  // Always first.
     PREVIEW_ERROR_BAD_SETTING,
     PREVIEW_ERROR_METAFILE_COPY_FAILED,
     PREVIEW_ERROR_METAFILE_INIT_FAILED,
     PREVIEW_ERROR_ZERO_PAGES,
@@ skipping 64 matching lines @@
 
   void Print(WebKit::WebFrame* frame, const WebKit::WebNode& node);
 
   // Notification when printing is done - signal tear-down/free resources.
   void DidFinishPrinting(PrintingResult result);
 
   // Print Settings -----------------------------------------------------------
 
   // Initialize print page settings with default settings.
   // Used only for native printing workflow.
-  bool InitPrintSettings(WebKit::WebFrame* frame, const WebKit::WebNode& node);
+  bool InitPrintSettings();
 
   // Initialize print page settings with default settings and prepare the frame
   // for print. A new PrepareFrameAndViewForPrint is created to fulfill the
   // request and is filled into the |prepare| argument.
   // Used only for native printing workflow.
   bool InitPrintSettingsAndPrepareFrame(
       WebKit::WebFrame* frame,
       const WebKit::WebNode& node,
       scoped_ptr<PrepareFrameAndViewForPrint>* prepare);
 
@@ skipping 124 matching lines @@
   // Returns true if cancelling, false if continuing.
   bool CheckForCancel();
 
   // Notifies the browser a print preview page has been rendered.
   // |page_number| is 0-based.
   // For a valid |page_number| with modifiable content,
   // |metafile| is the rendered page. Otherwise |metafile| is NULL.
   // Returns true if print preview should continue, false on failure.
   bool PreviewPageRendered(int page_number, printing::Metafile* metafile);
 
+  // WebView used only to print the selection.
   WebKit::WebView* print_web_view_;
 
   scoped_ptr<PrintMsg_PrintPages_Params> print_pages_params_;
   bool is_preview_enabled_;
   bool is_print_ready_metafile_sent_;
   bool ignore_css_margins_;
 
   // True if we need to auto fit to page else false.
   // NOTE: When we print to pdf, we don't fit to page.
   bool fit_to_page_;
@@ skipping 110 matching lines @@
 
     State state_;
   };
 
   PrintPreviewContext print_preview_context_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintWebViewHelper);
 };
 
 #endif  // CHROME_RENDERER_PRINT_WEB_VIEW_HELPER_H_