diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 16:30:13 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 16:30:13 +0000 |
| commit | 882b8b8123cadfe690eb1707b40460b30c3d691d (patch) | |
| tree | 563ddb5aeeebb42dbf004b8f1becd9899b509709 /chrome/renderer | |
| parent | 0c23428a4ffe32a614580b330b66e5b4448fc7af (diff) | |
| download | chromium_src-882b8b8123cadfe690eb1707b40460b30c3d691d.zip chromium_src-882b8b8123cadfe690eb1707b40460b30c3d691d.tar.gz chromium_src-882b8b8123cadfe690eb1707b40460b30c3d691d.tar.bz2 | |
Use PPAPI from chrome trunk rather than pulling via deps. This is a re-land from r64716. This is identical with an an include directory changed in the ppapi repo which I'm hoping was what was confusing everything.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/DEPS | 1 | ||||
| -rw-r--r-- | chrome/renderer/pepper_plugin_delegate_impl.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/pepper_plugin_delegate_impl.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS index b7bf978..99df536 100644 --- a/chrome/renderer/DEPS +++ b/chrome/renderer/DEPS @@ -7,6 +7,7 @@ include_rules = [ "+media/ffmpeg", "+media/filters", "+media/video", + "+ppapi/c", "+sandbox/src", "+skia/include", "+webkit/extensions", diff --git a/chrome/renderer/pepper_plugin_delegate_impl.cc b/chrome/renderer/pepper_plugin_delegate_impl.cc index ecaf0e4..b8ab08d 100644 --- a/chrome/renderer/pepper_plugin_delegate_impl.cc +++ b/chrome/renderer/pepper_plugin_delegate_impl.cc @@ -25,7 +25,7 @@ #include "chrome/renderer/render_view.h" #include "chrome/renderer/webplugin_delegate_proxy.h" #include "grit/locale_settings.h" -#include "third_party/ppapi/c/dev/pp_video_dev.h" +#include "ppapi/c/dev/pp_video_dev.h" #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserCompletion.h" #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserParams.h" #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h" diff --git a/chrome/renderer/pepper_plugin_delegate_impl.h b/chrome/renderer/pepper_plugin_delegate_impl.h index a1fb6a0..90c659a 100644 --- a/chrome/renderer/pepper_plugin_delegate_impl.h +++ b/chrome/renderer/pepper_plugin_delegate_impl.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/id_map.h" #include "base/weak_ptr.h" -#include "third_party/ppapi/c/pp_errors.h" +#include "ppapi/c/pp_errors.h" #include "webkit/glue/plugins/pepper_plugin_delegate.h" #include "webkit/glue/plugins/pepper_plugin_instance.h" |