Index: chrome/renderer/print_web_view_helper.h |
diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h |
index 82d5e034e4548ade1936d77da43e6ac013fd40a3..5d469041ffa55e6d30ef86dd378a989a3c58dcff 100644 |
--- a/chrome/renderer/print_web_view_helper.h |
+++ b/chrome/renderer/print_web_view_helper.h |
@@ -172,14 +172,11 @@ class PrintWebViewHelper : public RenderViewObserver, |
// Print Settings ----------------------------------------------------------- |
// Initialize print page settings with default settings. |
- bool InitPrintSettings(WebKit::WebFrame* frame, |
- WebKit::WebNode* node, |
- bool is_preview); |
- |
- // 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. |
- bool InitPrintSettingsAndPrepareFrame( |
+ bool InitPrintSettings(WebKit::WebFrame* frame); |
+ |
+ // Prepare the frame for print. A new PrepareFrameAndViewForPrint is created |
+ // to fulfill the request and is filled into the |prepare| argument. |
+ bool PrepareFrame( |
WebKit::WebFrame* frame, |
WebKit::WebNode* node, |
scoped_ptr<PrepareFrameAndViewForPrint>* prepare); |
@@ -334,6 +331,7 @@ class PrintWebViewHelper : public RenderViewObserver, |
PREVIEW_ERROR_MAC_DRAFT_METAFILE_INIT_FAILED, |
PREVIEW_ERROR_PAGE_RENDERED_WITHOUT_METAFILE, |
PREVIEW_ERROR_UPDATING_PRINT_SETTINGS, |
+ PREVIEW_ERROR_INVALID_PRINTER_SETTINGS, |
PREVIEW_ERROR_LAST_ENUM // Always last. |
}; |
@@ -390,6 +388,7 @@ class PrintWebViewHelper : public RenderViewObserver, |
printing::PreviewMetafile* metafile() const; |
const PrintMsg_Print_Params& print_params() const; |
const gfx::Size& GetPrintCanvasSize() const; |
+ int last_error() const; |
private: |
enum State { |