Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(309)

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 339613002: Revert of Support casting for embedded YT videos (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 // requests the stream. As a result, we cannot guarantee there is only 232 // requests the stream. As a result, we cannot guarantee there is only
233 // a single origin. Remove the following line when b/12573548 is fixed. 233 // a single origin. Remove the following line when b/12573548 is fixed.
234 // Check http://crbug.com/334204. 234 // Check http://crbug.com/334204.
235 info_loader_->set_single_origin(false); 235 info_loader_->set_single_origin(false);
236 info_loader_->Start(frame_); 236 info_loader_->Start(frame_);
237 } 237 }
238 238
239 url_ = url; 239 url_ = url;
240 GURL first_party_url = frame_->document().firstPartyForCookies(); 240 GURL first_party_url = frame_->document().firstPartyForCookies();
241 player_manager_->Initialize( 241 player_manager_->Initialize(
242 player_type_, player_id_, url, first_party_url, demuxer_client_id, 242 player_type_, player_id_, url, first_party_url, demuxer_client_id);
243 frame_->document().url());
244 243
245 if (player_manager_->ShouldEnterFullscreen(frame_)) 244 if (player_manager_->ShouldEnterFullscreen(frame_))
246 player_manager_->EnterFullscreen(player_id_, frame_); 245 player_manager_->EnterFullscreen(player_id_, frame_);
247 246
248 UpdateNetworkState(WebMediaPlayer::NetworkStateLoading); 247 UpdateNetworkState(WebMediaPlayer::NetworkStateLoading);
249 UpdateReadyState(WebMediaPlayer::ReadyStateHaveNothing); 248 UpdateReadyState(WebMediaPlayer::ReadyStateHaveNothing);
250 } 249 }
251 250
252 void WebMediaPlayerAndroid::DidLoadMediaInfo(MediaInfoLoader::Status status) { 251 void WebMediaPlayerAndroid::DidLoadMediaInfo(MediaInfoLoader::Status status) {
253 DCHECK(!media_source_delegate_); 252 DCHECK(!media_source_delegate_);
(...skipping 1294 matching lines...) Expand 10 before | Expand all | Expand 10 after
1548 1547
1549 void WebMediaPlayerAndroid::exitFullscreen() { 1548 void WebMediaPlayerAndroid::exitFullscreen() {
1550 player_manager_->ExitFullscreen(player_id_); 1549 player_manager_->ExitFullscreen(player_id_);
1551 } 1550 }
1552 1551
1553 bool WebMediaPlayerAndroid::canEnterFullscreen() const { 1552 bool WebMediaPlayerAndroid::canEnterFullscreen() const {
1554 return player_manager_->CanEnterFullscreen(frame_); 1553 return player_manager_->CanEnterFullscreen(frame_);
1555 } 1554 }
1556 1555
1557 } // namespace content 1556 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/renderer_media_player_manager.cc ('k') | media/base/android/media_player_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698