content/renderer/pepper/pepper_plugin_delegate_impl.cc - Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: more more clang fun Created 7 years, 5 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:

Index: content/renderer/pepper/pepper_plugin_delegate_impl.cc

===================================================================

--- content/renderer/pepper/pepper_plugin_delegate_impl.cc (revision 213561)

+++ content/renderer/pepper/pepper_plugin_delegate_impl.cc (working copy)

@@ -57,7 +57,13 @@

#include "content/renderer/pepper/pepper_platform_video_capture_impl.h"

#include "content/renderer/pepper/pepper_proxy_channel_delegate_impl.h"

#include "content/renderer/pepper/pepper_url_loader_host.h"

+#include "content/renderer/pepper/plugin_module.h"

+#include "content/renderer/pepper/ppapi_plugin_instance_impl.h"

+#include "content/renderer/pepper/ppapi_webplugin_impl.h"

+#include "content/renderer/pepper/ppb_tcp_server_socket_private_impl.h"

+#include "content/renderer/pepper/ppb_tcp_socket_private_impl.h"

#include "content/renderer/pepper/renderer_ppapi_host_impl.h"

+#include "content/renderer/pepper/resource_helper.h"

#include "content/renderer/pepper/url_response_info_util.h"

#include "content/renderer/render_thread_impl.h"

#include "content/renderer/render_view_impl.h"

@@ -95,12 +101,6 @@

#include "third_party/WebKit/public/web/WebView.h"

#include "ui/gfx/size.h"

#include "url/gurl.h"

-#include "webkit/plugins/ppapi/plugin_module.h"

-#include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h"

-#include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"

-#include "webkit/plugins/ppapi/ppb_tcp_server_socket_private_impl.h"

-#include "webkit/plugins/ppapi/ppb_tcp_socket_private_impl.h"

-#include "webkit/plugins/ppapi/resource_helper.h"

using WebKit::WebView;

using WebKit::WebFrame;

@@ -413,7 +413,6 @@

// module's destructor will remove itself.

module = new webkit::ppapi::PluginModule(

info->name, path,

- PepperPluginRegistry::GetInstance(),

permissions);

PepperPluginRegistry::GetInstance()->AddLiveModule(path, module.get());