components/nacl/renderer/plugin/plugin.h - 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/plugin.h

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/nacl_subprocess.h ('K') | « components/nacl/renderer/plugin/nacl_subprocess.cc ('k') | components/nacl/renderer/plugin/plugin.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/nacl/renderer/plugin/plugin.h

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

similarity index 96%

rename from ppapi/native_client/src/trusted/plugin/plugin.h

rename to components/nacl/renderer/plugin/plugin.h

index b1855f969965f1fddcc991d474604f1ddca389c0..225739c2860952694226f45fae509597a21e359e 100644

--- a/ppapi/native_client/src/trusted/plugin/plugin.h

+++ b/components/nacl/renderer/plugin/plugin.h

@@ -13,21 +13,18 @@

#include <string>

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

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

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

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

#include "native_client/src/include/nacl_macros.h"

#include "native_client/src/include/nacl_scoped_ptr.h"

#include "ppapi/c/private/ppb_nacl_private.h"

#include "ppapi/cpp/instance.h"

#include "ppapi/cpp/private/uma_private.h"

#include "ppapi/cpp/url_loader.h"

#include "ppapi/cpp/var.h"

#include "ppapi/cpp/view.h"

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

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

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

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

#include "ppapi/utility/completion_callback_factory.h"

namespace nacl {