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

Side by Side Diff: content/renderer/pepper/content_decryptor_delegate.h

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
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 CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
6 #define CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_ 6 #define CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <queue> 9 #include <queue>
10 #include <string> 10 #include <string>
(...skipping 10 matching lines...) Expand all
21 #include "media/base/decryptor.h" 21 #include "media/base/decryptor.h"
22 #include "media/base/media_keys.h" 22 #include "media/base/media_keys.h"
23 #include "media/base/sample_format.h" 23 #include "media/base/sample_format.h"
24 #include "ppapi/c/pp_time.h" 24 #include "ppapi/c/pp_time.h"
25 #include "ppapi/c/private/pp_content_decryptor.h" 25 #include "ppapi/c/private/pp_content_decryptor.h"
26 #include "ppapi/c/private/ppp_content_decryptor_private.h" 26 #include "ppapi/c/private/ppp_content_decryptor_private.h"
27 #include "ui/gfx/geometry/size.h" 27 #include "ui/gfx/geometry/size.h"
28 28
29 namespace media { 29 namespace media {
30 class AudioDecoderConfig; 30 class AudioDecoderConfig;
31 struct CdmConfig;
ddorwin 2015/05/13 06:03:20 unused
sandersd (OOO until July 31) 2015/05/14 00:06:57 Done.
31 class DecoderBuffer; 32 class DecoderBuffer;
32 class VideoDecoderConfig; 33 class VideoDecoderConfig;
33 } 34 }
34 35
35 namespace content { 36 namespace content {
36 37
37 class PPB_Buffer_Impl; 38 class PPB_Buffer_Impl;
38 39
39 class ContentDecryptorDelegate { 40 class ContentDecryptorDelegate {
40 public: 41 public:
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 247
247 base::WeakPtr<ContentDecryptorDelegate> weak_this_; 248 base::WeakPtr<ContentDecryptorDelegate> weak_this_;
248 base::WeakPtrFactory<ContentDecryptorDelegate> weak_ptr_factory_; 249 base::WeakPtrFactory<ContentDecryptorDelegate> weak_ptr_factory_;
249 250
250 DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate); 251 DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate);
251 }; 252 };
252 253
253 } // namespace content 254 } // namespace content
254 255
255 #endif // CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_ 256 #endif // CONTENT_RENDERER_PEPPER_CONTENT_DECRYPTOR_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698