| Index: content/renderer/pepper/content_decryptor_delegate.h
|
| ===================================================================
|
| --- content/renderer/pepper/content_decryptor_delegate.h (revision 213482)
|
| +++ content/renderer/pepper/content_decryptor_delegate.h (working copy)
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_
|
| -#define WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_
|
| +#ifndef CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
|
| +#define CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
|
|
|
| #include <queue>
|
| #include <string>
|
| @@ -18,7 +18,6 @@
|
| #include "ppapi/c/private/pp_content_decryptor.h"
|
| #include "ppapi/c/private/ppp_content_decryptor_private.h"
|
| #include "ui/gfx/size.h"
|
| -#include "webkit/plugins/webkit_plugins_export.h"
|
|
|
| namespace media {
|
| class AudioDecoderConfig;
|
| @@ -31,7 +30,7 @@
|
|
|
| class PPB_Buffer_Impl;
|
|
|
| -class WEBKIT_PLUGINS_EXPORT ContentDecryptorDelegate {
|
| +class ContentDecryptorDelegate {
|
| public:
|
| // ContentDecryptorDelegate does not take ownership of
|
| // |plugin_decryption_interface|. Therefore |plugin_decryption_interface|
|
| @@ -39,6 +38,7 @@
|
| ContentDecryptorDelegate(
|
| PP_Instance pp_instance,
|
| const PPP_ContentDecryptor_Private* plugin_decryption_interface);
|
| + ~ContentDecryptorDelegate();
|
|
|
| void Initialize(const std::string& key_system);
|
|
|
| @@ -192,4 +192,4 @@
|
| } // namespace ppapi
|
| } // namespace webkit
|
|
|
| -#endif // WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_
|
| +#endif // CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
|
|
|