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

Unified Diff: content/browser/browser_plugin/browser_plugin_guest.h

Issue 2426423004: Remove some linked_ptr from /content (Closed)
Patch Set: remove header includes Created 4 years, 2 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/browser/browser_plugin/browser_plugin_guest.h
diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h
index b99654e3bc7698b25d771afc76bdbfbfad5a3335..cd4d949652e32607bc4a07b0b2056b191c285df5 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.h
+++ b/content/browser/browser_plugin/browser_plugin_guest.h
@@ -21,11 +21,11 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <queue>
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/linked_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/values.h"
#include "build/build_config.h"
@@ -381,7 +381,8 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
// the input was created with browser_plugin::kInstanceIdNone, else it returns
// the input message unmodified. If no current browser_plugin_instance_id()
// is set, or anything goes wrong, the input message is returned.
- IPC::Message* UpdateInstanceIdIfNecessary(IPC::Message* msg) const;
+ IPC::Message* UpdateInstanceIdIfNecessary(
+ std::unique_ptr<IPC::Message> msg) const;
Avi (use Gerrit) 2016/10/19 18:08:23 This function prototype looks wrong for the commen
// Forwards all messages from the |pending_messages_| queue to the embedder.
void SendQueuedMessages();
@@ -447,7 +448,7 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
// This is a queue of messages that are destined to be sent to the embedder
// once the guest is attached to a particular embedder.
- std::deque<linked_ptr<IPC::Message> > pending_messages_;
+ std::deque<std::unique_ptr<IPC::Message>> pending_messages_;
BrowserPluginGuestDelegate* const delegate_;

Powered by Google App Engine
This is Rietveld 408576698