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

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

Issue 299753011: Move allocate instance id to chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: HasPermission function moved Created 6 years, 6 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 3114129f0330ce71b823bd0dd23634188e29ad9e..a3a9d69e9b7597de58ec30137dbc6b7104986d0a 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"
@@ -118,9 +119,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_;
}
@@ -177,7 +175,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
@@ -213,6 +211,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.
@@ -249,7 +251,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(
@@ -378,7 +379,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_;
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_embedder.cc ('k') | content/browser/browser_plugin/browser_plugin_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698