summaryrefslogtreecommitdiffstats
path: root/ppapi/examples
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-07 16:07:33 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-07 16:07:33 +0000
commit402ed256c68272cef07fb4590f5aad68ca24bdcd (patch)
treedcdd852f6ac3a685b0c91f6a4d6817016aa659c4 /ppapi/examples
parentb233a5810373eb44f8ad060504fae8ef23a54bc4 (diff)
downloadchromium_src-402ed256c68272cef07fb4590f5aad68ca24bdcd.zip
chromium_src-402ed256c68272cef07fb4590f5aad68ca24bdcd.tar.gz
chromium_src-402ed256c68272cef07fb4590f5aad68ca24bdcd.tar.bz2
Rename PPB_VideoDecoder_Dev test and example code to avoid collisions.
BUG=281689 R=fischman@chromium.org, teravest@chromium.org Review URL: https://codereview.chromium.org/269283002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268797 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/examples')
-rw-r--r--ppapi/examples/video_decode/video_decode_dev.cc (renamed from ppapi/examples/video_decode/video_decode.cc)2
-rw-r--r--ppapi/examples/video_decode/video_decode_dev.html (renamed from ppapi/examples/video_decode/video_decode.html)4
2 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/examples/video_decode/video_decode.cc b/ppapi/examples/video_decode/video_decode_dev.cc
index d1f7181..d6cb592 100644
--- a/ppapi/examples/video_decode/video_decode.cc
+++ b/ppapi/examples/video_decode/video_decode_dev.cc
@@ -5,10 +5,10 @@
#include <string.h>
#include <iostream>
-#include <sstream>
#include <list>
#include <map>
#include <set>
+#include <sstream>
#include <vector>
#include "ppapi/c/pp_errors.h"
diff --git a/ppapi/examples/video_decode/video_decode.html b/ppapi/examples/video_decode/video_decode_dev.html
index 13d42fc..8e098ca 100644
--- a/ppapi/examples/video_decode/video_decode.html
+++ b/ppapi/examples/video_decode/video_decode_dev.html
@@ -6,12 +6,12 @@
found in the LICENSE file.
-->
<head>
- <title>Video Decode Example</title>
+ <title>Video Decode (Dev) Example</title>
</head>
<body>
-<embed id="plugin" type="application/x-ppapi-example-video-decode"
+<embed id="plugin" type="application/x-ppapi-example-video-decode-dev"
width="640" height="480"/>
</body>