Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Side by Side Diff: webkit/plugins/ppapi/content_decryptor_delegate.h

Issue 15772012: Separate MediaKeys interface from Decryptor interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/media/webmediaplayer_impl.cc ('k') | webkit/plugins/ppapi/content_decryptor_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_ 5 #ifndef WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_
6 #define WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_ 6 #define WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_
7 7
8 #include <queue> 8 #include <queue>
9 #include <string> 9 #include <string>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "media/base/decryptor.h" 15 #include "media/base/decryptor.h"
16 #include "media/base/media_keys.h"
16 #include "ppapi/c/private/pp_content_decryptor.h" 17 #include "ppapi/c/private/pp_content_decryptor.h"
17 #include "ppapi/c/private/ppp_content_decryptor_private.h" 18 #include "ppapi/c/private/ppp_content_decryptor_private.h"
18 #include "ui/gfx/size.h" 19 #include "ui/gfx/size.h"
19 #include "webkit/plugins/webkit_plugins_export.h" 20 #include "webkit/plugins/webkit_plugins_export.h"
20 21
21 namespace media { 22 namespace media {
22 class AudioDecoderConfig; 23 class AudioDecoderConfig;
23 class DecoderBuffer; 24 class DecoderBuffer;
24 class VideoDecoderConfig; 25 class VideoDecoderConfig;
25 } 26 }
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 base::WeakPtrFactory<ContentDecryptorDelegate> weak_ptr_factory_; 169 base::WeakPtrFactory<ContentDecryptorDelegate> weak_ptr_factory_;
169 base::WeakPtr<ContentDecryptorDelegate> weak_this_; 170 base::WeakPtr<ContentDecryptorDelegate> weak_this_;
170 171
171 DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate); 172 DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate);
172 }; 173 };
173 174
174 } // namespace ppapi 175 } // namespace ppapi
175 } // namespace webkit 176 } // namespace webkit
176 177
177 #endif // WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_ 178 #endif // WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_
OLDNEW
« no previous file with comments | « webkit/media/webmediaplayer_impl.cc ('k') | webkit/plugins/ppapi/content_decryptor_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698