diff options
| author | mseaborn <mseaborn@chromium.org> | 2015-01-29 11:39:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-29 19:41:33 +0000 |
| commit | 45df3da06ad59fd20f0c3e7efdd9bc4b5a0e213f (patch) | |
| tree | 40b484cd4483416d3d1c8591c1e378776bdf96d1 /extensions/shell/common | |
| parent | f4704598a63e2effd53b638700e480e7e218fb85 (diff) | |
| download | chromium_src-45df3da06ad59fd20f0c3e7efdd9bc4b5a0e213f.zip chromium_src-45df3da06ad59fd20f0c3e7efdd9bc4b5a0e213f.tar.gz chromium_src-45df3da06ad59fd20f0c3e7efdd9bc4b5a0e213f.tar.bz2 | |
NaCl: Move src/trusted/plugin/ to components/nacl/renderer/plugin/
This moves the "trusted plugin" code so that all the NaCl
renderer-side code is in the same place, under
components/nacl/renderer/. I've used the "renderer/plugin/" subdir so
that this legacy code is distinguished from the newer code that's
directly under "renderer/".
This will make further incremental cleanups easier: It will enable
closer integration between renderer/* and renderer/plugin/*. Rather
than indirecting through PPB_NaCl_Private/PPP_PexeStreamHandler, it
would be reasonable for the two sides to share pointers to C++
objects. Doing that will be more acceptable when the two sides live
in the same directory.
* chrome/chrome_tests.gypi: Declaring a runtime dependency isn't
necessary since the trusted plugin isn't a separate DSO/DLL these
days.
* .gitignore: Remove reference to ppGoogleNaClPluginChrome.xml, which
no longer exists.
* module_ppapi.h: Added an #include guard.
BUG=239656
TEST=trybots
Review URL: https://codereview.chromium.org/876483002
Cr-Commit-Position: refs/heads/master@{#313759}
Diffstat (limited to 'extensions/shell/common')
| -rw-r--r-- | extensions/shell/common/DEPS | 1 | ||||
| -rw-r--r-- | extensions/shell/common/shell_content_client.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/extensions/shell/common/DEPS b/extensions/shell/common/DEPS index 6facae8..bee8c47 100644 --- a/extensions/shell/common/DEPS +++ b/extensions/shell/common/DEPS @@ -1,4 +1,5 @@ include_rules = [ "+components/nacl/common", + "+components/nacl/renderer/plugin", "+ppapi", ] diff --git a/extensions/shell/common/shell_content_client.cc b/extensions/shell/common/shell_content_client.cc index ff51a83..1879a8f 100644 --- a/extensions/shell/common/shell_content_client.cc +++ b/extensions/shell/common/shell_content_client.cc @@ -17,8 +17,8 @@ #include "base/files/file_path.h" #include "base/path_service.h" #include "components/nacl/common/nacl_constants.h" +#include "components/nacl/renderer/plugin/ppapi_entrypoints.h" #include "content/public/common/pepper_plugin_info.h" -#include "ppapi/native_client/src/trusted/plugin/ppapi_entrypoints.h" #include "ppapi/shared_impl/ppapi_permissions.h" #endif |