| 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 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 // side CDM will be used. This is similar to WebMediaPlayerImpl. For other key | 469 // side CDM will be used. This is similar to WebMediaPlayerImpl. For other key |
| 470 // systems, a browser side CDM will be used and we set CDM by calling | 470 // systems, a browser side CDM will be used and we set CDM by calling |
| 471 // player_manager_->SetCdm() directly. | 471 // player_manager_->SetCdm() directly. |
| 472 media::DecryptorReadyCB decryptor_ready_cb_; | 472 media::DecryptorReadyCB decryptor_ready_cb_; |
| 473 | 473 |
| 474 SkBitmap bitmap_; | 474 SkBitmap bitmap_; |
| 475 | 475 |
| 476 // Whether stored credentials are allowed to be passed to the server. | 476 // Whether stored credentials are allowed to be passed to the server. |
| 477 bool allow_stored_credentials_; | 477 bool allow_stored_credentials_; |
| 478 | 478 |
| 479 // Whether the resource is local. |
| 480 bool is_local_resource_; |
| 481 |
| 479 // NOTE: Weak pointers must be invalidated before all other member variables. | 482 // NOTE: Weak pointers must be invalidated before all other member variables. |
| 480 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; | 483 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; |
| 481 | 484 |
| 482 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); | 485 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); |
| 483 }; | 486 }; |
| 484 | 487 |
| 485 } // namespace content | 488 } // namespace content |
| 486 | 489 |
| 487 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 490 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
| OLD | NEW |