Cleanup: Merge common code in RenderView::OnPrintPages and RenderView::OnPrin...

chrome/renderer/render_view.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 1126 matching lines @@
     error = true;
 
   DCHECK(error == snapshot.empty()) <<
       "Snapshot should be empty on error, non-empty otherwise.";
 
   // Send the snapshot to the browser process.
   Send(new ViewHostMsg_Snapshot(routing_id_, snapshot));
 }
 
 void RenderView::OnPrintPages() {
-  DCHECK(webview());
-  if (webview()) {
-    // If the user has selected text in the currently focused frame we print
-    // only that frame (this makes print selection work for multiple frames).
-    if (webview()->focusedFrame()->hasSelection())
-      Print(webview()->focusedFrame(), false, false);
-    else
-      Print(webview()->mainFrame(), false, false);
-  }
+  OnPrint(false);
 }
 
 void RenderView::OnPrintingDone(int document_cookie, bool success) {
   // Ignoring document cookie here since only one print job can be outstanding
   // per renderer and document_cookie is 0 when printing is successful.
   DCHECK(print_helper_.get());
   if (print_helper_.get() != NULL) {
     print_helper_->DidFinishPrinting(success);
   }
 }
 
 void RenderView::OnPrintPreview() {
-  DCHECK(webview());
-  if (webview()) {
-    // If the user has selected text in the currently focused frame we print
-    // only that frame (this makes print selection work for multiple frames).
-    if (webview()->focusedFrame()->hasSelection())
-      Print(webview()->focusedFrame(), false, true);
-    else
-      Print(webview()->focusedFrame(), false, true);

[Lei Zhang, 2011/01/20 05:47:03]

Was this a copy+paste mistake or was this intentional? Why do we have if/else
clauses that do the same thing?

[kmadhusu, 2011/01/20 17:17:23]

It is a mistake. Thanks for fixing it.

-  }
+  OnPrint(true);
 }
 
 void RenderView::OnPrintNodeUnderContextMenu() {
   if (context_menu_node_.isNull()) {
     NOTREACHED();
     return;
   }
 
   // Make a copy of the node, since we will do a sync call to the browser and
   // during that time OnContextMenuClosed might reset context_menu_node_.
@@ skipping 4094 matching lines @@
     // When no accessibility notifications are in-flight post a task to send
     // the notifications to the browser. We use PostTask so that we can queue
     // up additional notifications.
     MessageLoop::current()->PostTask(
         FROM_HERE,
         accessibility_method_factory_.NewRunnableMethod(
             &RenderView::SendPendingAccessibilityNotifications));
   }
 }
 
+void RenderView::OnPrint(bool is_preview) {
+  DCHECK(webview());
+  if (webview()) {
+    // If the user has selected text in the currently focused frame we print
+    // only that frame (this makes print selection work for multiple frames).
+    if (webview()->focusedFrame()->hasSelection())
+      Print(webview()->focusedFrame(), false, is_preview);
+    else
+      Print(webview()->mainFrame(), false, is_preview);
+  }
+}
+
 void RenderView::Print(WebFrame* frame,
                        bool script_initiated,
                        bool is_preview) {
   DCHECK(frame);
   GetPrintWebViewHelper()->PrintFrame(frame, script_initiated, is_preview);
 }
 
 PrintWebViewHelper* RenderView::GetPrintWebViewHelper() {
   if (print_helper_.get() == NULL)
     print_helper_.reset(new PrintWebViewHelper(this));
@@ skipping 383 matching lines @@
   if (cmd == kJavaScriptStressTestSetStressRunType) {
     v8::Testing::SetStressRunType(static_cast<v8::Testing::StressType>(param));
   } else if (cmd == kJavaScriptStressTestPrepareStressRun) {
     v8::Testing::PrepareStressRun(param);
   }
 }
 
 void RenderView::OnContextMenuClosed() {
   context_menu_node_.reset();
 }