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 #include "media/base/android/media_player_bridge.h" | 5 #include "media/base/android/media_player_bridge.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 namespace media { | 26 namespace media { |
27 | 27 |
28 MediaPlayerBridge::MediaPlayerBridge( | 28 MediaPlayerBridge::MediaPlayerBridge( |
29 int player_id, | 29 int player_id, |
30 const GURL& url, | 30 const GURL& url, |
31 const GURL& first_party_for_cookies, | 31 const GURL& first_party_for_cookies, |
32 const std::string& user_agent, | 32 const std::string& user_agent, |
33 bool hide_url_log, | 33 bool hide_url_log, |
34 MediaPlayerManager* manager, | 34 MediaPlayerManager* manager, |
35 const RequestMediaResourcesCB& request_media_resources_cb, | 35 const RequestMediaResourcesCB& request_media_resources_cb, |
36 const ReleaseMediaResourcesCB& release_media_resources_cb) | 36 const ReleaseMediaResourcesCB& release_media_resources_cb, |
| 37 const GURL& frame_url) |
37 : MediaPlayerAndroid(player_id, | 38 : MediaPlayerAndroid(player_id, |
38 manager, | 39 manager, |
39 request_media_resources_cb, | 40 request_media_resources_cb, |
40 release_media_resources_cb), | 41 release_media_resources_cb, |
| 42 frame_url), |
41 prepared_(false), | 43 prepared_(false), |
42 pending_play_(false), | 44 pending_play_(false), |
43 url_(url), | 45 url_(url), |
44 first_party_for_cookies_(first_party_for_cookies), | 46 first_party_for_cookies_(first_party_for_cookies), |
45 user_agent_(user_agent), | 47 user_agent_(user_agent), |
46 hide_url_log_(hide_url_log), | 48 hide_url_log_(hide_url_log), |
47 width_(0), | 49 width_(0), |
48 height_(0), | 50 height_(0), |
49 can_pause_(true), | 51 can_pause_(true), |
50 can_seek_forward_(true), | 52 can_seek_forward_(true), |
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
479 | 481 |
480 GURL MediaPlayerBridge::GetFirstPartyForCookies() { | 482 GURL MediaPlayerBridge::GetFirstPartyForCookies() { |
481 return first_party_for_cookies_; | 483 return first_party_for_cookies_; |
482 } | 484 } |
483 | 485 |
484 bool MediaPlayerBridge::IsSurfaceInUse() const { | 486 bool MediaPlayerBridge::IsSurfaceInUse() const { |
485 return is_surface_in_use_; | 487 return is_surface_in_use_; |
486 } | 488 } |
487 | 489 |
488 } // namespace media | 490 } // namespace media |
OLD | NEW |