| Index: chrome/renderer/printing/print_web_view_helper.h
|
| diff --git a/chrome/renderer/printing/print_web_view_helper.h b/chrome/renderer/printing/print_web_view_helper.h
|
| index 43a76caf2f3cf7d8fa8a1d3bb9c9f78ec18ecd7f..67bcc73c91a9afc31d0402e312174523485a59c9 100644
|
| --- a/chrome/renderer/printing/print_web_view_helper.h
|
| +++ b/chrome/renderer/printing/print_web_view_helper.h
|
| @@ -75,10 +75,8 @@ class PrintWebViewHelper
|
|
|
| private:
|
| friend class PrintWebViewHelperTestBase;
|
| - FRIEND_TEST_ALL_PREFIXES(PrintWebViewHelperTest,
|
| + FRIEND_TEST_ALL_PREFIXES(PrintWebViewHelperPreviewTest,
|
| BlockScriptInitiatedPrinting);
|
| - FRIEND_TEST_ALL_PREFIXES(PrintWebViewHelperTest,
|
| - BlockScriptInitiatedPrintingFromPopup);
|
| FRIEND_TEST_ALL_PREFIXES(PrintWebViewHelperTest, OnPrintPages);
|
|
|
| #if defined(OS_WIN) || defined(OS_MACOSX)
|
| @@ -294,24 +292,13 @@ class PrintWebViewHelper
|
| bool IsScriptInitiatedPrintAllowed(blink::WebFrame* frame,
|
| bool user_initiated);
|
|
|
| - // Returns true if script initiated printing occurs too often.
|
| - bool IsScriptInitiatedPrintTooFrequent(blink::WebFrame* frame);
|
| -
|
| - // Reset the counter for script initiated printing.
|
| - // Scripted printing will be allowed to continue.
|
| - void ResetScriptedPrintCount();
|
| -
|
| - // Increment the counter for script initiated printing.
|
| - // Scripted printing will be blocked for a limited amount of time.
|
| - void IncrementScriptedPrintCount();
|
| -
|
| - // Shows scripted print preview when options from plugin are availible.
|
| + // Shows scripted print preview when options from plugin are available.
|
| void ShowScriptedPrintPreview();
|
|
|
| void RequestPrintPreview(PrintPreviewRequestType type);
|
|
|
| // Checks whether print preview should continue or not.
|
| - // Returns true if cancelling, false if continuing.
|
| + // Returns true if canceling, false if continuing.
|
| bool CheckForCancel();
|
|
|
| // Notifies the browser a print preview page has been rendered.
|
| @@ -328,14 +315,9 @@ class PrintWebViewHelper
|
| bool reset_prep_frame_view_;
|
|
|
| scoped_ptr<PrintMsg_PrintPages_Params> print_pages_params_;
|
| - bool is_preview_enabled_;
|
| - bool is_scripted_print_throttling_disabled_;
|
| bool is_print_ready_metafile_sent_;
|
| bool ignore_css_margins_;
|
| -
|
| // Used for scripted initiated printing blocking.
|
| - base::Time last_cancelled_script_print_;
|
| - int user_cancelled_scripted_print_count_;
|
| bool is_scripted_printing_blocked_;
|
|
|
| // Let the browser process know of a printing failure. Only set to false when
|
|
|