| 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 3be3d526cc67644958594da433d0cc3b735c7799..c33e1aa7d375b6499cb6d6b8b26dc10786e39353 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"
|
| @@ -123,9 +124,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_;
|
| }
|
| @@ -185,7 +183,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
|
| @@ -228,6 +226,10 @@ class CONTENT_EXPORT BrowserPluginGuest : public WebContentsObserver {
|
|
|
| void WillDestroy(WebContents* web_contents);
|
|
|
| + 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.
|
| @@ -265,7 +267,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(
|
| @@ -398,7 +399,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_;
|
|
|
| scoped_ptr<BrowserPluginGuestDelegate> delegate_;
|
|
|
|
|