components/nacl/renderer/plugin/module_ppapi.cc - Issue 876483002: NaCl: Move src/trusted/plugin/ to components/nacl/renderer/plugin/

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: components/nacl/renderer/plugin/module_ppapi.cc

Issue 876483002: NaCl: Move src/trusted/plugin/ to components/nacl/renderer/plugin/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebase + #include order Created 5 years, 11 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

« components/nacl/renderer/plugin/module_ppapi.h ('K') | « components/nacl/renderer/plugin/module_ppapi.h ('k') | components/nacl/renderer/plugin/nacl_subprocess.h » ('j') | components/nacl/renderer/plugin/nacl_subprocess.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/nacl/renderer/plugin/module_ppapi.cc

diff --git a/ppapi/native_client/src/trusted/plugin/module_ppapi.cc b/components/nacl/renderer/plugin/module_ppapi.cc

similarity index 93%

rename from ppapi/native_client/src/trusted/plugin/module_ppapi.cc

rename to components/nacl/renderer/plugin/module_ppapi.cc

index bcdaf7d47e014d50523d86a933c7285db5e35b7c..f59e6660553d8a88040f5c7f643d14d6bfdfd366 100644

--- a/ppapi/native_client/src/trusted/plugin/module_ppapi.cc

+++ b/components/nacl/renderer/plugin/module_ppapi.cc

@@ -4,15 +4,14 @@

* found in the LICENSE file.

+#include "components/nacl/renderer/plugin/module_ppapi.h"

+#include "components/nacl/renderer/plugin/plugin.h"

+#include "components/nacl/renderer/plugin/utility.h"

#include "native_client/src/shared/imc/nacl_imc_c.h"

#include "native_client/src/shared/platform/nacl_secure_random.h"

#include "native_client/src/shared/platform/nacl_time.h"

#include "native_client/src/trusted/desc/nrd_all_modules.h"

-#include "ppapi/native_client/src/trusted/plugin/module_ppapi.h"

-#include "ppapi/native_client/src/trusted/plugin/plugin.h"

-#include "ppapi/native_client/src/trusted/plugin/utility.h"

namespace plugin {

ModulePpapi::ModulePpapi() : pp::Module(),