| OLD | NEW | 
|---|
| 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 MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_ | 5 #ifndef MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_ | 
| 6 #define MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_ | 6 #define MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_ | 
| 7 | 7 | 
| 8 #include "base/callback.h" | 8 #include "base/callback.h" | 
|  | 9 #include "base/macros.h" | 
| 9 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" | 
| 10 #include "media/base/cdm_context.h" | 11 #include "media/base/cdm_context.h" | 
| 11 #include "media/base/decryptor.h" | 12 #include "media/base/decryptor.h" | 
| 12 #include "media/base/video_decoder.h" | 13 #include "media/base/video_decoder.h" | 
| 13 #include "media/base/video_decoder_config.h" | 14 #include "media/base/video_decoder_config.h" | 
| 14 | 15 | 
| 15 namespace base { | 16 namespace base { | 
| 16 class SingleThreadTaskRunner; | 17 class SingleThreadTaskRunner; | 
| 17 } | 18 } | 
| 18 | 19 | 
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 118 | 119 | 
| 119   base::WeakPtr<DecryptingVideoDecoder> weak_this_; | 120   base::WeakPtr<DecryptingVideoDecoder> weak_this_; | 
| 120   base::WeakPtrFactory<DecryptingVideoDecoder> weak_factory_; | 121   base::WeakPtrFactory<DecryptingVideoDecoder> weak_factory_; | 
| 121 | 122 | 
| 122   DISALLOW_COPY_AND_ASSIGN(DecryptingVideoDecoder); | 123   DISALLOW_COPY_AND_ASSIGN(DecryptingVideoDecoder); | 
| 123 }; | 124 }; | 
| 124 | 125 | 
| 125 }  // namespace media | 126 }  // namespace media | 
| 126 | 127 | 
| 127 #endif  // MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_ | 128 #endif  // MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_ | 
| OLD | NEW | 
|---|