content/ppapi_plugin/ppapi_thread.h - 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/ppapi_plugin/ppapi_thread.h

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/ppapi_plugin/ppapi_thread.h

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

--- content/ppapi_plugin/ppapi_thread.h (revision 213561)

+++ content/ppapi_plugin/ppapi_thread.h (working copy)

@@ -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 @@

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_.

« no previous file with comments | « content/content_tests.gypi ('k') | content/public/common/pepper_plugin_info.h » ('j') | no next file with comments »