| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
| 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 | 436 |
| 437 // Temporary for EME v0.1. In the future the init data type should be passed | 437 // Temporary for EME v0.1. In the future the init data type should be passed |
| 438 // through GenerateKeyRequest() directly from WebKit. | 438 // through GenerateKeyRequest() directly from WebKit. |
| 439 std::string init_data_type_; | 439 std::string init_data_type_; |
| 440 | 440 |
| 441 media::DecryptorReadyCB decryptor_ready_cb_; | 441 media::DecryptorReadyCB decryptor_ready_cb_; |
| 442 | 442 |
| 443 // Manages decryption keys and decrypts encrypted frames. | 443 // Manages decryption keys and decrypts encrypted frames. |
| 444 scoped_ptr<ProxyDecryptor> proxy_decryptor_; | 444 scoped_ptr<ProxyDecryptor> proxy_decryptor_; |
| 445 | 445 |
| 446 // NOTE: This must always be last so it's invalidated before other member |
| 447 // variables might be accessed. |
| 446 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; | 448 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; |
| 447 | 449 |
| 448 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); | 450 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); |
| 449 }; | 451 }; |
| 450 | 452 |
| 451 } // namespace content | 453 } // namespace content |
| 452 | 454 |
| 453 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 455 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
| OLD | NEW |