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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/android/context_utils.h" | 9 #include "base/android/context_utils.h" |
10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 | 36 |
37 MediaPlayerBridge::MediaPlayerBridge( | 37 MediaPlayerBridge::MediaPlayerBridge( |
38 int player_id, | 38 int player_id, |
39 const GURL& url, | 39 const GURL& url, |
40 const GURL& first_party_for_cookies, | 40 const GURL& first_party_for_cookies, |
41 const std::string& user_agent, | 41 const std::string& user_agent, |
42 bool hide_url_log, | 42 bool hide_url_log, |
43 MediaPlayerManager* manager, | 43 MediaPlayerManager* manager, |
44 const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb, | 44 const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb, |
45 const GURL& frame_url, | 45 const GURL& frame_url, |
46 bool allow_credentials) | 46 bool allow_credentials, |
| 47 int media_session_id) |
47 : MediaPlayerAndroid(player_id, | 48 : MediaPlayerAndroid(player_id, |
48 manager, | 49 manager, |
49 on_decoder_resources_released_cb, | 50 on_decoder_resources_released_cb, |
50 frame_url), | 51 frame_url, |
| 52 media_session_id), |
51 prepared_(false), | 53 prepared_(false), |
52 pending_play_(false), | 54 pending_play_(false), |
53 should_seek_on_prepare_(false), | 55 should_seek_on_prepare_(false), |
54 url_(url), | 56 url_(url), |
55 first_party_for_cookies_(first_party_for_cookies), | 57 first_party_for_cookies_(first_party_for_cookies), |
56 user_agent_(user_agent), | 58 user_agent_(user_agent), |
57 hide_url_log_(hide_url_log), | 59 hide_url_log_(hide_url_log), |
58 width_(0), | 60 width_(0), |
59 height_(0), | 61 height_(0), |
60 can_pause_(true), | 62 can_pause_(true), |
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
596 | 598 |
597 GURL MediaPlayerBridge::GetUrl() { | 599 GURL MediaPlayerBridge::GetUrl() { |
598 return url_; | 600 return url_; |
599 } | 601 } |
600 | 602 |
601 GURL MediaPlayerBridge::GetFirstPartyForCookies() { | 603 GURL MediaPlayerBridge::GetFirstPartyForCookies() { |
602 return first_party_for_cookies_; | 604 return first_party_for_cookies_; |
603 } | 605 } |
604 | 606 |
605 } // namespace media | 607 } // namespace media |
OLD | NEW |