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

Unified Diff: pdf/out_of_process_instance.h

Issue 1881013004: Convert pdf/ to use std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | pdf/pdfium/pdfium_engine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pdf/out_of_process_instance.h
diff --git a/pdf/out_of_process_instance.h b/pdf/out_of_process_instance.h
index bdd0e686015ddcecd201599a58fed73996d7b3d8..0842d33bde12371729a40d223757931d066b80a1 100644
--- a/pdf/out_of_process_instance.h
+++ b/pdf/out_of_process_instance.h
@@ -8,6 +8,7 @@
#include <stdint.h>
#include <string.h>
+#include <memory>
#include <queue>
#include <set>
#include <string>
@@ -15,7 +16,6 @@
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "pdf/paint_manager.h"
#include "pdf/pdf_engine.h"
#include "pdf/preview_mode_client.h"
@@ -256,16 +256,16 @@ class OutOfProcessInstance : public pp::Instance,
PrintSettings print_settings_;
- scoped_ptr<PDFEngine> engine_;
+ std::unique_ptr<PDFEngine> engine_;
// The PreviewModeClient used for print preview. Will be passed to
// |preview_engine_|.
- scoped_ptr<PreviewModeClient> preview_client_;
+ std::unique_ptr<PreviewModeClient> preview_client_;
// This engine is used to render the individual preview page data. This is
// used only in print preview mode. This will use |PreviewModeClient|
// interface which has very limited access to the pp::Instance.
- scoped_ptr<PDFEngine> preview_engine_;
+ std::unique_ptr<PDFEngine> preview_engine_;
std::string url_;
@@ -277,7 +277,7 @@ class OutOfProcessInstance : public pp::Instance,
pp::CompletionCallbackFactory<OutOfProcessInstance> print_callback_factory_;
// The callback for receiving the password from the page.
- scoped_ptr<pp::CompletionCallbackWithOutput<pp::Var> > password_callback_;
+ std::unique_ptr<pp::CompletionCallbackWithOutput<pp::Var>> password_callback_;
// True if we haven't painted the plugin viewport yet.
bool first_paint_;
@@ -309,7 +309,7 @@ class OutOfProcessInstance : public pp::Instance,
// Used to signal the browser about focus changes to trigger the OSK.
// TODO(abodenha@chromium.org) Implement full IME support in the plugin.
// http://crbug.com/132565
- scoped_ptr<pp::TextInput_Dev> text_input_;
+ std::unique_ptr<pp::TextInput_Dev> text_input_;
// The last document load progress value sent to the web page.
double last_progress_sent_;
« no previous file with comments | « no previous file | pdf/pdfium/pdfium_engine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698