summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/pepper_plugin_delegate_impl.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-28 21:28:46 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-28 21:28:46 +0000
commitd213ab5841654a50dfb9f90a271a451fef3457cf (patch)
tree424ab5edbfbd66c4f662ccc769d8ba0f6802293a /chrome/renderer/pepper_plugin_delegate_impl.h
parent1bf58e1635c6225aba534e7b0c1fb5cac0b0b3ec (diff)
downloadchromium_src-d213ab5841654a50dfb9f90a271a451fef3457cf.zip
chromium_src-d213ab5841654a50dfb9f90a271a451fef3457cf.tar.gz
chromium_src-d213ab5841654a50dfb9f90a271a451fef3457cf.tar.bz2
Pull latest Pepper to get moved audio, video, and char set interfaces, now
called "dev." This also marks un-flaky the image data test which I think I fixed. BUG=51344 TEST=covered by unit tests Review URL: http://codereview.chromium.org/3243007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/pepper_plugin_delegate_impl.h')
-rw-r--r--chrome/renderer/pepper_plugin_delegate_impl.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/renderer/pepper_plugin_delegate_impl.h b/chrome/renderer/pepper_plugin_delegate_impl.h
index 9fce915..1930fa8 100644
--- a/chrome/renderer/pepper_plugin_delegate_impl.h
+++ b/chrome/renderer/pepper_plugin_delegate_impl.h
@@ -11,7 +11,6 @@
#include "base/basictypes.h"
#include "base/weak_ptr.h"
#include "third_party/ppapi/c/pp_errors.h"
-#include "third_party/ppapi/c/pp_video.h"
#include "webkit/glue/plugins/pepper_plugin_delegate.h"
#include "webkit/glue/plugins/pepper_plugin_instance.h"
@@ -48,7 +47,7 @@ class PepperPluginDelegateImpl
virtual PlatformImage2D* CreateImage2D(int width, int height);
virtual PlatformContext3D* CreateContext3D();
virtual PlatformVideoDecoder* CreateVideoDecoder(
- const PP_VideoDecoderConfig& decoder_config);
+ const PP_VideoDecoderConfig_Dev& decoder_config);
virtual void DidChangeNumberOfFindResults(int identifier,
int total,
bool final_result);