| 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 #include "content/renderer/media/android/webmediaplayer_android.h" | 5 #include "content/renderer/media/android/webmediaplayer_android.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 // a single origin. Remove the following line when b/12573548 is fixed. | 227 // a single origin. Remove the following line when b/12573548 is fixed. |
| 228 // Check http://crbug.com/334204. | 228 // Check http://crbug.com/334204. |
| 229 info_loader_->set_single_origin(false); | 229 info_loader_->set_single_origin(false); |
| 230 info_loader_->Start(frame_); | 230 info_loader_->Start(frame_); |
| 231 } | 231 } |
| 232 | 232 |
| 233 url_ = url; | 233 url_ = url; |
| 234 GURL first_party_url = frame_->document().firstPartyForCookies(); | 234 GURL first_party_url = frame_->document().firstPartyForCookies(); |
| 235 manager_->Initialize( | 235 manager_->Initialize( |
| 236 player_type_, player_id_, url, first_party_url, demuxer_client_id); | 236 player_type_, player_id_, url, first_party_url, demuxer_client_id); |
| 237 manager_->SetPlayerFrameUrl(player_id_, frame_->document().url()); |
| 237 | 238 |
| 238 if (manager_->ShouldEnterFullscreen(frame_)) | 239 if (manager_->ShouldEnterFullscreen(frame_)) |
| 239 manager_->EnterFullscreen(player_id_, frame_); | 240 manager_->EnterFullscreen(player_id_, frame_); |
| 240 | 241 |
| 241 UpdateNetworkState(WebMediaPlayer::NetworkStateLoading); | 242 UpdateNetworkState(WebMediaPlayer::NetworkStateLoading); |
| 242 UpdateReadyState(WebMediaPlayer::ReadyStateHaveNothing); | 243 UpdateReadyState(WebMediaPlayer::ReadyStateHaveNothing); |
| 243 } | 244 } |
| 244 | 245 |
| 245 void WebMediaPlayerAndroid::DidLoadMediaInfo(MediaInfoLoader::Status status) { | 246 void WebMediaPlayerAndroid::DidLoadMediaInfo(MediaInfoLoader::Status status) { |
| 246 DCHECK(!media_source_delegate_); | 247 DCHECK(!media_source_delegate_); |
| (...skipping 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1554 | 1555 |
| 1555 void WebMediaPlayerAndroid::exitFullscreen() { | 1556 void WebMediaPlayerAndroid::exitFullscreen() { |
| 1556 manager_->ExitFullscreen(player_id_); | 1557 manager_->ExitFullscreen(player_id_); |
| 1557 } | 1558 } |
| 1558 | 1559 |
| 1559 bool WebMediaPlayerAndroid::canEnterFullscreen() const { | 1560 bool WebMediaPlayerAndroid::canEnterFullscreen() const { |
| 1560 return manager_->CanEnterFullscreen(frame_); | 1561 return manager_->CanEnterFullscreen(frame_); |
| 1561 } | 1562 } |
| 1562 | 1563 |
| 1563 } // namespace content | 1564 } // namespace content |
| OLD | NEW |