Cleanup.

diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
index 7ab0318..4b6ab9c 100644 (file)
--- a/atom/browser/api/atom_api_window.cc
+++ b/atom/browser/api/atom_api_window.cc
@@ -421,7 +421,7 @@ void Window::CapturePage(mate::Arguments* args) {
 }
 
 void Window::Print(mate::Arguments* args) {
-  PrintSettings settings = { false, false };;
+  PrintSettings settings = { false, false };
   if (args->Length() == 1 && !args->GetNext(&settings)) {
     args->ThrowError();
     return;

diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 2edf890..e1cdab5 100644 (file)
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -268,7 +268,7 @@ void NativeWindow::Print(bool silent, bool print_background) {
 void NativeWindow::PrintToPDF(const mate::Dictionary& options,
                               const PrintToPDFCallback& callback) {
   printing::PrintPreviewMessageHandler::FromWebContents(GetWebContents())->
-      HandleGetPreview(options, callback);
+      PrintToPDF(options, callback);
 }
 
 void NativeWindow::ShowDefinitionForSelection() {

diff --git a/chromium_src/chrome/browser/printing/print_preview_message_handler.cc b/chromium_src/chrome/browser/printing/print_preview_message_handler.cc
index ee47742..0ba9ea6 100644 (file)
--- a/chromium_src/chrome/browser/printing/print_preview_message_handler.cc
+++ b/chromium_src/chrome/browser/printing/print_preview_message_handler.cc
@@ -79,7 +79,8 @@ namespace printing {
 
 PrintPreviewMessageHandler::PrintPreviewMessageHandler(
     WebContents* web_contents)
-    : content::WebContentsObserver(web_contents) {
+    : request_id_(0),
+      content::WebContentsObserver(web_contents) {
   DCHECK(web_contents);
 }
 
@@ -92,8 +93,6 @@ void PrintPreviewMessageHandler::OnDidGetPreviewPageCount(
     NOTREACHED();
     return;
   }
-
-  LOG(ERROR) << "OnDidGetPreviewPageCount:  " << params.page_count;
 }
 
 void PrintPreviewMessageHandler::OnDidPreviewPage(
@@ -101,7 +100,6 @@ void PrintPreviewMessageHandler::OnDidPreviewPage(
   int page_number = params.page_number;
   if (page_number < FIRST_PAGE_INDEX || !params.data_size)
     return;
-  LOG(ERROR) << "OnDidPreviewPage:  " << params.data_size;
 }
 
 void PrintPreviewMessageHandler::OnMetafileReadyForPrinting(
@@ -122,7 +120,6 @@ void PrintPreviewMessageHandler::OnMetafileReadyForPrinting(
   if (!data || !data->size())
     return;
 
-  LOG(ERROR) << params.preview_request_id;
   atom::NativeWindow* window = atom::NativeWindow::FromWebContents(
       web_contents());
   base::FilePath save_path;
@@ -147,39 +144,6 @@ void PrintPreviewMessageHandler::OnPrintPreviewFailed(int document_cookie,
   RunPrintToPDFCallback(request_id, FAIL_PREVIEW);
 }
 
-//void PrintPreviewMessageHandler::OnDidGetDefaultPageLayout(
-    //const PageSizeMargins& page_layout_in_points,
-    //const gfx::Rect& printable_area_in_points,
-    //bool has_custom_page_size_style) {
-  ////PrintPreviewUI* print_preview_ui = GetPrintPreviewUI();
-  ////if (!print_preview_ui)
-    ////return;
-  ////print_preview_ui->OnDidGetDefaultPageLayout(page_layout_in_points,
-                                              ////printable_area_in_points,
-                                              ////has_custom_page_size_style);
-//}
-
-//void PrintPreviewMessageHandler::OnPrintPreviewCancelled(int document_cookie) {
-  //// Always need to stop the worker.
-  //StopWorker(document_cookie);
-//}
-
-//void PrintPreviewMessageHandler::OnInvalidPrinterSettings(int document_cookie) {
-  //StopWorker(document_cookie);
-  ////PrintPreviewUI* print_preview_ui = GetPrintPreviewUI();
-  ////if (!print_preview_ui)
-    ////return;
-  ////print_preview_ui->OnInvalidPrinterSettings();
-//}
-
-//void PrintPreviewMessageHandler::OnSetOptionsFromDocument(
-    //const PrintHostMsg_SetOptionsFromDocument_Params& params) {
-  ////PrintPreviewUI* print_preview_ui = GetPrintPreviewUI();
-  ////if (!print_preview_ui)
-    ////return;
-  ////print_preview_ui->OnSetOptionsFromDocument(params);
-//}
-
 bool PrintPreviewMessageHandler::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
@@ -192,24 +156,14 @@ bool PrintPreviewMessageHandler::OnMessageReceived(
                         OnMetafileReadyForPrinting)
     IPC_MESSAGE_HANDLER(PrintHostMsg_PrintPreviewFailed,
                         OnPrintPreviewFailed)
-    //IPC_MESSAGE_HANDLER(PrintHostMsg_DidGetDefaultPageLayout,
-                        //OnDidGetDefaultPageLayout)
-    //IPC_MESSAGE_HANDLER(PrintHostMsg_PrintPreviewCancelled,
-                        //OnPrintPreviewCancelled)
-    //IPC_MESSAGE_HANDLER(PrintHostMsg_PrintPreviewInvalidPrinterSettings,
-                        //OnInvalidPrinterSettings)
-    //IPC_MESSAGE_HANDLER(PrintHostMsg_SetOptionsFromDocument,
-                        //OnSetOptionsFromDocument)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void PrintPreviewMessageHandler::HandleGetPreview(
+void PrintPreviewMessageHandler::PrintToPDF(
     const mate::Dictionary& options,
     const atom::NativeWindow::PrintToPDFCallback& callback) {
-  static int request_id = 0;
-  request_id++;
   // A simulated Chromium print preivew setting. 
   const std::string setting_json_str =  "{ \
     \"pageRage\":[], \
@@ -244,8 +198,9 @@ void PrintPreviewMessageHandler::HandleGetPreview(
   scoped_ptr<base::DictionaryValue> settings(
       static_cast<base::DictionaryValue*>(
           base::JSONReader::Read(setting_json_str)));
-  settings->SetInteger(printing::kPreviewRequestID, request_id);
-  print_to_pdf_callback_map_[request_id] = callback;
+  settings->SetInteger(printing::kPreviewRequestID, request_id_);
+  print_to_pdf_callback_map_[request_id_] = callback;
+  ++request_id_;
 
 
   // Default Print PDF settings:
@@ -267,7 +222,6 @@ void PrintPreviewMessageHandler::HandleGetPreview(
   settings->SetBoolean(printing::kSettingShouldPrintSelectionOnly,
                        print_selection_only);
   settings->SetBoolean(printing::kSettingLandscape, is_landscape);
-  LOG(ERROR) << "Print preview request start";
   content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
   rvh->Send(new PrintMsg_PrintPreview(rvh->GetRoutingID(), *settings));
 }

diff --git a/chromium_src/chrome/browser/printing/print_preview_message_handler.h b/chromium_src/chrome/browser/printing/print_preview_message_handler.h
index f4298fb..585eca7 100644 (file)
--- a/chromium_src/chrome/browser/printing/print_preview_message_handler.h
+++ b/chromium_src/chrome/browser/printing/print_preview_message_handler.h
@@ -49,10 +49,8 @@ class PrintPreviewMessageHandler
   // content::WebContentsObserver implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
 
-  // Asks the initiator renderer to generate a preview.  First element of |args|
-  // is a job settings JSON string.
-  void HandleGetPreview(const mate::Dictionary& options,
-                        const atom::NativeWindow::PrintToPDFCallback& callback);
+  void PrintToPDF(const mate::Dictionary& options,
+                  const atom::NativeWindow::PrintToPDFCallback& callback);
 
  private:
   typedef std::map<int, atom::NativeWindow::PrintToPDFCallback> PrintToPDFCallbackMap;
@@ -60,27 +58,19 @@ class PrintPreviewMessageHandler
   explicit PrintPreviewMessageHandler(content::WebContents* web_contents);
   friend class content::WebContentsUserData<PrintPreviewMessageHandler>;
 
-
   // Message handlers.
-  //void OnRequestPrintPreview(
-      //const PrintHostMsg_RequestPrintPreview_Params& params);
-  //void OnDidGetDefaultPageLayout(
-      //const printing::PageSizeMargins& page_layout_in_points,
-      //const gfx::Rect& printable_area_in_points,
-      //bool has_custom_page_size_style);
   void OnDidGetPreviewPageCount(
       const PrintHostMsg_DidGetPreviewPageCount_Params& params);
   void OnDidPreviewPage(const PrintHostMsg_DidPreviewPage_Params& params);
   void OnMetafileReadyForPrinting(
       const PrintHostMsg_DidPreviewDocument_Params& params);
   void OnPrintPreviewFailed(int document_cookie, int request_id);
-  //void OnPrintPreviewCancelled(int document_cookie);
-  //void OnInvalidPrinterSettings(int document_cookie);
-  //void OnSetOptionsFromDocument(
-      //const PrintHostMsg_SetOptionsFromDocument_Params& params);
 
   void RunPrintToPDFCallback(int request_id, PrintPDFResult result);
 
+  // PrintToPDF request id counter.
+  int request_id_;
+
   PrintToPDFCallbackMap print_to_pdf_callback_map_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewMessageHandler);

diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc
index 550735f..643340d 100644 (file)
--- a/chromium_src/chrome/renderer/printing/print_web_view_helper.cc
+++ b/chromium_src/chrome/renderer/printing/print_web_view_helper.cc
@@ -717,19 +717,16 @@ void PrintWebViewHelper::OnPrintPreview(const base::DictionaryValue& settings) {
   blink::WebLocalFrame* frame;
   if (GetPrintFrame(&frame)) {
     print_preview_context_.InitWithFrame(frame);
-    LOG(ERROR) << "OnPrintPreview1";
     if (!print_preview_context_.source_frame()) {
       DidFinishPrinting(FAIL_PREVIEW);
       return;
     }
 
-    LOG(ERROR) << "OnPrintPreview2";
     if (!UpdatePrintSettings(print_preview_context_.source_frame(),
                            print_preview_context_.source_node(), settings)) {
       DidFinishPrinting(FAIL_PREVIEW);
       return;
     }
-    LOG(ERROR) << "OnPrintPreview3";
     is_print_ready_metafile_sent_ = false;
     PrepareFrameForPreviewDocument();
   }