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

Unified Diff: components/printing/renderer/print_web_view_helper.h

Issue 1884743002: Convert a few components from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lint Created 4 years, 8 months 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
Index: components/printing/renderer/print_web_view_helper.h
diff --git a/components/printing/renderer/print_web_view_helper.h b/components/printing/renderer/print_web_view_helper.h
index 39ef8588c796358cdf78a8b1cbe41846d0222f54..7232b229a656f65bdc36d86e843d12510dba58d7 100644
--- a/components/printing/renderer/print_web_view_helper.h
+++ b/components/printing/renderer/print_web_view_helper.h
@@ -5,12 +5,12 @@
#ifndef COMPONENTS_PRINTING_RENDERER_PRINT_WEB_VIEW_HELPER_H_
#define COMPONENTS_PRINTING_RENDERER_PRINT_WEB_VIEW_HELPER_H_
+#include <memory>
#include <vector>
#include "base/callback.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
@@ -108,7 +108,7 @@ class PrintWebViewHelper
};
PrintWebViewHelper(content::RenderView* render_view,
- scoped_ptr<Delegate> delegate);
+ std::unique_ptr<Delegate> delegate);
~PrintWebViewHelper() override;
// Disable print preview and switch to system dialog printing even if full
@@ -364,10 +364,10 @@ class PrintWebViewHelper
void SetPrintPagesParams(const PrintMsg_PrintPages_Params& settings);
// WebView used only to print the selection.
- scoped_ptr<PrepareFrameAndViewForPrint> prep_frame_view_;
+ std::unique_ptr<PrepareFrameAndViewForPrint> prep_frame_view_;
bool reset_prep_frame_view_;
- scoped_ptr<PrintMsg_PrintPages_Params> print_pages_params_;
+ std::unique_ptr<PrintMsg_PrintPages_Params> print_pages_params_;
bool is_print_ready_metafile_sent_;
bool ignore_css_margins_;
@@ -382,7 +382,7 @@ class PrintWebViewHelper
bool print_for_preview_;
// Used to check the prerendering status.
- const scoped_ptr<Delegate> delegate_;
+ const std::unique_ptr<Delegate> delegate_;
// Keeps track of the state of print preview between messages.
// TODO(vitalybuka): Create PrintPreviewContext when needed and delete after
@@ -466,8 +466,8 @@ class PrintWebViewHelper
FrameReference source_frame_;
blink::WebNode source_node_;
- scoped_ptr<PrepareFrameAndViewForPrint> prep_frame_view_;
- scoped_ptr<PdfMetafileSkia> metafile_;
+ std::unique_ptr<PrepareFrameAndViewForPrint> prep_frame_view_;
+ std::unique_ptr<PdfMetafileSkia> metafile_;
// Total page count in the renderer.
int total_page_count_;
« no previous file with comments | « components/pdf/browser/pdf_web_contents_helper.cc ('k') | components/printing/renderer/print_web_view_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698