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