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

Unified Diff: content/renderer/pepper/pepper_plugin_delegate_impl.h

Issue 15947004: Allow renderer to create pepper ResourceHosts in the browser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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/renderer/pepper/pepper_plugin_delegate_impl.h
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.h b/content/renderer/pepper/pepper_plugin_delegate_impl.h
index 176214f1df799468b94a8830292fe6e51f2ce47f..5f327e7253072e05fa56f2ee5a3568e65d9297fd 100644
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.h
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.h
@@ -18,6 +18,7 @@
#include "base/observer_list.h"
#include "content/public/renderer/render_view_observer.h"
#include "content/renderer/mouse_lock_dispatcher.h"
+#include "content/renderer/pepper/pepper_browser_connection.h"
#include "content/renderer/render_view_pepper_helper.h"
#include "ppapi/c/pp_file_info.h"
#include "ppapi/shared_impl/private/ppb_tcp_server_socket_shared.h"
@@ -70,6 +71,10 @@ class PepperPluginDelegateImpl
RenderViewImpl* render_view() { return render_view_; }
+ PepperBrowserConnection* pepper_browser_connection() {
+ return &pepper_browser_connection_;
+ }
+
// Sets up the renderer host and out-of-process proxy for an external plugin
// module. Returns the renderer host, or NULL if it couldn't be created.
RendererPpapiHost* CreateExternalPluginModule(
@@ -411,6 +416,10 @@ class PepperPluginDelegateImpl
// Pointer to the RenderView that owns us.
RenderViewImpl* render_view_;
+ // Connection for sending and receiving pepper host-related messages to/from
+ // the browser.
+ PepperBrowserConnection pepper_browser_connection_;
+
std::set<webkit::ppapi::PluginInstance*> active_instances_;
typedef std::map<webkit::ppapi::PluginInstance*,
MouseLockDispatcher::LockTarget*> LockTargetMap;
« no previous file with comments | « content/renderer/pepper/pepper_browser_connection.cc ('k') | content/renderer/pepper/pepper_plugin_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698