Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6396)

Unified Diff: chrome/renderer/print_web_view_helper.h

Issue 11367033: "Using" cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/renderer/print_web_view_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/print_web_view_helper.h
diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h
index c30677d4a9114d344100650565b13ffe45544621..e33cb62a6274b100f3e2002267c7fc78422e722c 100644
--- a/chrome/renderer/print_web_view_helper.h
+++ b/chrome/renderer/print_web_view_helper.h
@@ -13,7 +13,6 @@
#include "base/time.h"
#include "content/public/renderer/render_view_observer.h"
#include "content/public/renderer/render_view_observer_tracker.h"
-#include "printing/metafile.h"
#include "printing/metafile_impl.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h"
@@ -29,10 +28,16 @@ struct PrintMsg_PrintPages_Params;
namespace base {
class DictionaryValue;
}
+
namespace printing {
struct PageSizeMargins;
}
+namespace WebKit {
+class WebFrame;
+class WebView;
+}
+
// Class that calls the Begin and End print functions on the frame and changes
// the size of the view temporarily to support full page printing..
// Do not serve any events in the time between construction and destruction of
@@ -56,10 +61,7 @@ class PrepareFrameAndViewForPrint {
return use_browser_overlays_;
}
- gfx::Size GetPrintCanvasSize() const {
- return gfx::Size(web_print_params_.printContentArea.width,
- web_print_params_.printContentArea.height);
- }
+ gfx::Size GetPrintCanvasSize() const;
void FinishPrinting();
@@ -191,7 +193,8 @@ class PrintWebViewHelper
// Renders a print preview page. |page_number| is 0-based.
// Returns true if print preview should continue, false on failure.
- bool RenderPreviewPage(int page_number);
+ bool RenderPreviewPage(int page_number,
+ const PrintMsg_Print_Params& print_params);
// Finalize the print ready preview document.
bool FinalizePrintReadyDocument();
@@ -322,7 +325,8 @@ class PrintWebViewHelper
int total_pages,
float webkit_scale_factor,
const printing::PageSizeMargins& page_layout_in_points,
- const base::DictionaryValue& header_footer_info);
+ const base::DictionaryValue& header_footer_info,
+ const PrintMsg_Print_Params& params);
bool GetPrintFrame(WebKit::WebFrame** frame);
@@ -403,7 +407,7 @@ class PrintWebViewHelper
void OnPrintPreview();
// Create the print preview document. |pages| is empty to print all pages.
- bool CreatePreviewDocument(PrintMsg_Print_Params* params,
+ bool CreatePreviewDocument(const PrintMsg_Print_Params& params,
const std::vector<int>& pages,
bool ignore_css_margins);
@@ -440,7 +444,6 @@ class PrintWebViewHelper
int total_page_count() const;
bool generate_draft_pages() const;
printing::PreviewMetafile* metafile();
- const PrintMsg_Print_Params& print_params() const;
gfx::Size GetPrintCanvasSize() const;
int last_error() const;
@@ -461,7 +464,6 @@ class PrintWebViewHelper
scoped_ptr<PrepareFrameAndViewForPrint> prep_frame_view_;
scoped_ptr<printing::PreviewMetafile> metafile_;
- scoped_ptr<PrintMsg_Print_Params> print_params_;
// Total page count in the renderer.
int total_page_count_;
« no previous file with comments | « no previous file | chrome/renderer/print_web_view_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698