Merge 182959

chrome/renderer/printing/print_web_view_helper.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_RENDERER_PRINTING_PRINT_WEB_VIEW_HELPER_H_
 #define CHROME_RENDERER_PRINTING_PRINT_WEB_VIEW_HELPER_H_
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
@@ skipping 184 matching lines @@
                            const base::DictionaryValue& passed_job_settings);
 
   // Get final print settings from the user.
   // Return false if the user cancels or on error.
   bool GetPrintSettingsFromUser(WebKit::WebFrame* frame,
                                 const WebKit::WebNode& node,
                                 int expected_pages_count);
 
   // Page Printing / Rendering ------------------------------------------------
 
+  void OnFramePreparedForPrintPages();
   void PrintPages();
   bool PrintPagesNative(WebKit::WebFrame* frame,
                         const WebKit::WebNode& node,
                         int page_count,
                         const gfx::Size& canvas_size);
+  void FinishFramePrinting();
 
   // Prints the page listed in |params|.
 #if defined(USE_X11)
   void PrintPageInternal(const PrintMsg_PrintPage_Params& params,
                          const gfx::Size& canvas_size,
                          WebKit::WebFrame* frame,
                          Metafile* metafile);
 #else
   void PrintPageInternal(const PrintMsg_PrintPage_Params& params,
                          const gfx::Size& canvas_size,
@@ skipping 235 matching lines @@
   };
 
   bool print_node_in_progress_;
   PrintPreviewContext print_preview_context_;
   DISALLOW_COPY_AND_ASSIGN(PrintWebViewHelper);
 };
 
 }  // namespace printing
 
 #endif  // CHROME_RENDERER_PRINTING_PRINT_WEB_VIEW_HELPER_H_