diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 02:23:05 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 02:23:05 +0000 |
| commit | 20790a2251838ef5d3f2432ba6f0c9f54e7c7838 (patch) | |
| tree | a54762e7c5803efc7955c709eade6c541c18a804 /content/ppapi_plugin | |
| parent | 64974bea71a5c4cf95e67afef2e121e04af451f4 (diff) | |
| download | chromium_src-20790a2251838ef5d3f2432ba6f0c9f54e7c7838.zip chromium_src-20790a2251838ef5d3f2432ba6f0c9f54e7c7838.tar.gz chromium_src-20790a2251838ef5d3f2432ba6f0c9f54e7c7838.tar.bz2 | |
Move webkit/plugins/ppapi to content/renderer/pepper.
I will change namespaces in a followup as this got very large. Also, I have a temporary dependency from content/common onto content/renderer for PluginModule that I only discovered at the end. I will remove that in a followup.
BUG=263054
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/20165002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/ppapi_thread.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/ppapi_plugin/ppapi_thread.h b/content/ppapi_plugin/ppapi_thread.h index 9fb56c1..7726a98 100644 --- a/content/ppapi_plugin/ppapi_thread.h +++ b/content/ppapi_plugin/ppapi_thread.h @@ -15,13 +15,13 @@ #include "base/scoped_native_library.h" #include "build/build_config.h" #include "content/child/child_thread.h" +#include "content/public/common/pepper_plugin_info.h" #include "ipc/ipc_listener.h" #include "ppapi/c/pp_module.h" #include "ppapi/c/trusted/ppp_broker.h" #include "ppapi/proxy/plugin_dispatcher.h" #include "ppapi/proxy/plugin_globals.h" #include "ppapi/proxy/plugin_proxy_delegate.h" -#include "webkit/plugins/ppapi/plugin_module.h" #if defined(OS_WIN) #include "base/win/scoped_handle.h" @@ -138,7 +138,7 @@ class PpapiThread : public ChildThread, ppapi::proxy::PluginGlobals plugin_globals_; // Storage for plugin entry points. - webkit::ppapi::PluginModule::EntryPoints plugin_entry_points_; + PepperPluginInfo::EntryPoints plugin_entry_points_; // Callback to call when a new instance connects to the broker. // Used only when is_broker_. |