Printing: Rename some variables in the two different PrintPages() to be more ...

chrome/renderer/print_web_view_helper.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/print_web_view_helper.h"
 
+#include <string>
+
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/renderer/render_view.h"
 #include "grit/generated_resources.h"
 #include "printing/units.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
@@ skipping 222 matching lines @@
   int page_count = prep_frame_view.GetExpectedPageCount();
 
   Send(new ViewHostMsg_DidGetPrintedPagesCount(routing_id(),
                                                printParams.document_cookie,
                                                page_count));
   if (!page_count)
     return;
 
   const gfx::Size& canvas_size = prep_frame_view.GetPrintCanvasSize();
   ViewMsg_PrintPage_Params page_params;
-  page_params.params = params.params;
+  page_params.params = printParams;
   if (params.pages.empty()) {
     for (int i = 0; i < page_count; ++i) {
       page_params.page_number = i;
       PrintPage(page_params, canvas_size, frame);
     }
   } else {
     for (size_t i = 0; i < params.pages.size(); ++i) {
       if (params.pages[i] >= page_count)
         break;
       page_params.page_number = params.pages[i];
@@ skipping 247 matching lines @@
         shared_buf.GiveToProcess(base::GetCurrentProcessHandle(),
                                  shared_mem_handle);
         return true;
       }
     }
   }
   NOTREACHED();
   return false;
 }
 #endif