Clean up PrintRenderFrameHelper::Delegate impls.

- Make them all consistent. - Remove IsAskPrintSettingsEnabled() method since all impls as the same. Change-Id: Ief39548a5ab9fd7ea92638f41612282c82373df1 Reviewed-on: https://chromium-review.googlesource.com/875264 Reviewed-by: Jianzhou Feng <jzfeng@chromium.org> Reviewed-by: Bo <boliu@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org> Cr-Commit-Position: refs/heads/master@{#530436}
Denger-Network · Jan 19, 2018 · 5e76ebb · 5e76ebb
1 parent 54f8d09
commit 5e76ebb
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 21 deletions.
diff --git a/android_webview/renderer/aw_print_render_frame_helper_delegate.cc b/android_webview/renderer/aw_print_render_frame_helper_delegate.cc
@@ -8,7 +8,9 @@
 
 namespace android_webview {
 
-AwPrintRenderFrameHelperDelegate::~AwPrintRenderFrameHelperDelegate() {}
+AwPrintRenderFrameHelperDelegate::AwPrintRenderFrameHelperDelegate() = default;
+
+AwPrintRenderFrameHelperDelegate::~AwPrintRenderFrameHelperDelegate() = default;
 
 bool AwPrintRenderFrameHelperDelegate::CancelPrerender(
     content::RenderFrame* render_frame) {

diff --git a/android_webview/renderer/aw_print_render_frame_helper_delegate.h b/android_webview/renderer/aw_print_render_frame_helper_delegate.h
@@ -5,13 +5,15 @@
 #ifndef ANDROID_WEBVIEW_RENDERER_AW_PRINT_RENDER_FRAME_HELPER_DELEGATE_H_
 #define ANDROID_WEBVIEW_RENDERER_AW_PRINT_RENDER_FRAME_HELPER_DELEGATE_H_
 
+#include "base/macros.h"
 #include "components/printing/renderer/print_render_frame_helper.h"
 
 namespace android_webview {
 
 class AwPrintRenderFrameHelperDelegate
     : public printing::PrintRenderFrameHelper::Delegate {
  public:
+  AwPrintRenderFrameHelperDelegate();
   ~AwPrintRenderFrameHelperDelegate() override;
 
  private:
@@ -21,6 +23,8 @@ class AwPrintRenderFrameHelperDelegate
   bool IsPrintPreviewEnabled() override;
   bool IsScriptedPrintEnabled() override;
   bool OverridePrint(blink::WebLocalFrame* frame) override;
+
+  DISALLOW_COPY_AND_ASSIGN(AwPrintRenderFrameHelperDelegate);
 };
 
 }  // namespace android_webview

diff --git a/chrome/renderer/printing/chrome_print_render_frame_helper_delegate.cc b/chrome/renderer/printing/chrome_print_render_frame_helper_delegate.cc
@@ -25,7 +25,11 @@
 #include "extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h"
 #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
 
-ChromePrintRenderFrameHelperDelegate::~ChromePrintRenderFrameHelperDelegate() {}
+ChromePrintRenderFrameHelperDelegate::ChromePrintRenderFrameHelperDelegate() =
+    default;
+
+ChromePrintRenderFrameHelperDelegate::~ChromePrintRenderFrameHelperDelegate() =
+    default;
 
 bool ChromePrintRenderFrameHelperDelegate::CancelPrerender(
     content::RenderFrame* render_frame) {

diff --git a/chrome/renderer/printing/chrome_print_render_frame_helper_delegate.h b/chrome/renderer/printing/chrome_print_render_frame_helper_delegate.h
@@ -5,20 +5,23 @@
 #ifndef CHROME_RENDERER_PRINTING_CHROME_PRINT_RENDER_FRAME_HELPER_DELEGATE_H_
 #define CHROME_RENDERER_PRINTING_CHROME_PRINT_RENDER_FRAME_HELPER_DELEGATE_H_
 
+#include "base/macros.h"
 #include "components/printing/renderer/print_render_frame_helper.h"
 
 class ChromePrintRenderFrameHelperDelegate
     : public printing::PrintRenderFrameHelper::Delegate {
  public:
+  ChromePrintRenderFrameHelperDelegate();
   ~ChromePrintRenderFrameHelperDelegate() override;
 
+ private:
+  // printing::PrintRenderFrameHelper::Delegate:
   bool CancelPrerender(content::RenderFrame* render_frame) override;
-
   blink::WebElement GetPdfElement(blink::WebLocalFrame* frame) override;
-
   bool IsPrintPreviewEnabled() override;
-
   bool OverridePrint(blink::WebLocalFrame* frame) override;
-};  // class ChromePrintRenderFrameHelperDelegate
+
+  DISALLOW_COPY_AND_ASSIGN(ChromePrintRenderFrameHelperDelegate);
+};
 
 #endif  // CHROME_RENDERER_PRINTING_CHROME_PRINT_RENDER_FRAME_HELPER_DELEGATE_H_
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
@@ -932,10 +932,6 @@ void PrepareFrameAndViewForPrint::FinishPrinting() {
   on_ready_.Reset();
 }
 
-bool PrintRenderFrameHelper::Delegate::IsAskPrintSettingsEnabled() {
-  return true;
-}
-
 bool PrintRenderFrameHelper::Delegate::IsScriptedPrintEnabled() {
   return true;
 }
@@ -1491,7 +1487,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
   }
 
   // Ask the browser to show UI to retrieve the final print settings.
-  if (delegate_->IsAskPrintSettingsEnabled()) {
+  {
     // PrintHostMsg_ScriptedPrint in GetPrintSettingsFromUser() will reset
     // |print_scaling_option|, so save the value here and restore it afterwards.
     blink::WebPrintScalingOption scaling_option =

diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
@@ -99,10 +99,6 @@ class PrintRenderFrameHelper
 
     virtual bool IsPrintPreviewEnabled() = 0;
 
-    // If true, the user can be asked to provide print settings.
-    // The default implementation returns |true|.
-    virtual bool IsAskPrintSettingsEnabled();
-
     // If false, window.print() won't do anything.
     // The default implementation returns |true|.
     virtual bool IsScriptedPrintEnabled();

diff --git a/headless/lib/renderer/headless_print_render_frame_helper_delegate.cc b/headless/lib/renderer/headless_print_render_frame_helper_delegate.cc
@@ -33,8 +33,4 @@ bool HeadlessPrintRenderFrameHelperDelegate::OverridePrint(
   return false;
 }
 
-bool HeadlessPrintRenderFrameHelperDelegate::IsAskPrintSettingsEnabled() {
-  return true;
-}
-
 }  // namespace headless
diff --git a/headless/lib/renderer/headless_print_render_frame_helper_delegate.h b/headless/lib/renderer/headless_print_render_frame_helper_delegate.h
@@ -16,11 +16,11 @@ class HeadlessPrintRenderFrameHelperDelegate
   HeadlessPrintRenderFrameHelperDelegate();
   ~HeadlessPrintRenderFrameHelperDelegate() override;
 
-  // PrintRenderFrameHelper Delegate implementation.
+ private:
+  // printing::PrintRenderFrameHelper::Delegate:
   bool CancelPrerender(content::RenderFrame* render_frame) override;
   bool IsPrintPreviewEnabled() override;
   bool OverridePrint(blink::WebLocalFrame* frame) override;
-  bool IsAskPrintSettingsEnabled() override;
   blink::WebElement GetPdfElement(blink::WebLocalFrame* frame) override;
 
   DISALLOW_COPY_AND_ASSIGN(HeadlessPrintRenderFrameHelperDelegate);