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

Unified Diff: content/renderer/presentation/presentation_dispatcher.h

Issue 1873783003: Convert //content/renderer from scoped_ptr to 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
Index: content/renderer/presentation/presentation_dispatcher.h
diff --git a/content/renderer/presentation/presentation_dispatcher.h b/content/renderer/presentation/presentation_dispatcher.h
index 3688fa4e4a6ce7e68a8a8d72353cdf10e942a1d6..149da97d7e6fed7d6b1621a17a90f0ee1e0fb657 100644
--- a/content/renderer/presentation/presentation_dispatcher.h
+++ b/content/renderer/presentation/presentation_dispatcher.h
@@ -9,12 +9,12 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <queue>
#include "base/compiler_specific.h"
#include "base/id_map.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "content/common/content_export.h"
#include "content/common/presentation/presentation_service.mojom.h"
#include "content/public/renderer/render_frame_observer.h"
@@ -133,7 +133,7 @@ class CONTENT_EXPORT PresentationDispatcher
// Message requests are queued here and only one message at a time is sent
// over mojo channel.
- using MessageRequestQueue = std::queue<scoped_ptr<SendMessageRequest>>;
+ using MessageRequestQueue = std::queue<std::unique_ptr<SendMessageRequest>>;
MessageRequestQueue message_request_queue_;
enum class ListeningState {
@@ -159,7 +159,8 @@ class CONTENT_EXPORT PresentationDispatcher
AvailabilityObserversSet availability_observers;
};
- std::map<std::string, scoped_ptr<AvailabilityStatus>> availability_status_;
+ std::map<std::string, std::unique_ptr<AvailabilityStatus>>
+ availability_status_;
// Updates the listening state of availability for |status| and notifies the
// client.
« no previous file with comments | « content/renderer/pepper/video_encoder_shim.h ('k') | content/renderer/presentation/presentation_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698