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 f1c6fe019b04a4045cd7fa771edaf78e3d090701..d8218d287a790403dc7430ccd608e1ce2341156a 100644 |
--- a/content/browser/browser_plugin/browser_plugin_guest.h |
+++ b/content/browser/browser_plugin/browser_plugin_guest.h |
@@ -22,6 +22,7 @@ |
#include <queue> |
#include "base/compiler_specific.h" |
+#include "base/memory/linked_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/values.h" |
#include "content/common/edit_command.h" |
@@ -119,9 +120,6 @@ class CONTENT_EXPORT BrowserPluginGuest : public WebContentsObserver { |
bool OnMessageReceivedFromEmbedder(const IPC::Message& message); |
- void Initialize(const BrowserPluginHostMsg_Attach_Params& params, |
- WebContentsImpl* embedder_web_contents); |
- |
WebContentsImpl* embedder_web_contents() const { |
return embedder_web_contents_; |
} |
@@ -180,7 +178,7 @@ class CONTENT_EXPORT BrowserPluginGuest : public WebContentsObserver { |
// parameters passed into BrowserPlugin from JavaScript to be forwarded to |
// the content embedder. |
void Attach(WebContentsImpl* embedder_web_contents, |
- BrowserPluginHostMsg_Attach_Params params, |
+ const BrowserPluginHostMsg_Attach_Params& params, |
const base::DictionaryValue& extra_params); |
// Returns whether BrowserPluginGuest is interested in receiving the given |
@@ -223,6 +221,10 @@ class CONTENT_EXPORT BrowserPluginGuest : public WebContentsObserver { |
void WillDestroy(); |
+ void Initialize(const BrowserPluginHostMsg_Attach_Params& params, |
+ WebContentsImpl* embedder_web_contents, |
+ const base::DictionaryValue& extra_params); |
+ |
bool InAutoSizeBounds(const gfx::Size& size) const; |
// Message handlers for messages from embedder. |
@@ -260,7 +262,6 @@ class CONTENT_EXPORT BrowserPluginGuest : public WebContentsObserver { |
bool last_unlocked_by_target, |
bool privileged); |
void OnLockMouseAck(int instance_id, bool succeeded); |
- void OnNavigateGuest(int instance_id, const std::string& src); |
void OnPluginDestroyed(int instance_id); |
// Resizes the guest's web contents. |
void OnResizeGuest( |
@@ -393,7 +394,7 @@ class CONTENT_EXPORT BrowserPluginGuest : public WebContentsObserver { |
// 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::queue<IPC::Message*> pending_messages_; |
+ std::deque<linked_ptr<IPC::Message> > pending_messages_; |
BrowserPluginGuestDelegate* delegate_; |