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/browser/media/android/browser_media_player_manager.h" | 5 #include "content/browser/media/android/browser_media_player_manager.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "content/browser/android/content_view_core_impl.h" | 8 #include "content/browser/android/content_view_core_impl.h" |
9 #include "content/browser/media/android/browser_demuxer_android.h" | 9 #include "content/browser/media/android/browser_demuxer_android.h" |
10 #include "content/browser/media/android/media_resource_getter_impl.h" | 10 #include "content/browser/media/android/media_resource_getter_impl.h" |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 MediaPlayerHostMsg_Initialize_Type type, | 69 MediaPlayerHostMsg_Initialize_Type type, |
70 int player_id, | 70 int player_id, |
71 const GURL& url, | 71 const GURL& url, |
72 const GURL& first_party_for_cookies, | 72 const GURL& first_party_for_cookies, |
73 int demuxer_client_id, | 73 int demuxer_client_id, |
74 bool hide_url_log, | 74 bool hide_url_log, |
75 MediaPlayerManager* manager, | 75 MediaPlayerManager* manager, |
76 BrowserDemuxerAndroid* demuxer) { | 76 BrowserDemuxerAndroid* demuxer) { |
77 switch (type) { | 77 switch (type) { |
78 case MEDIA_PLAYER_TYPE_URL: { | 78 case MEDIA_PLAYER_TYPE_URL: { |
79 const std::string user_agent = GetUserAgent(url); | 79 const std::string user_agent = GetContentClient()->GetUserAgent(); |
80 MediaPlayerBridge* media_player_bridge = new MediaPlayerBridge( | 80 MediaPlayerBridge* media_player_bridge = new MediaPlayerBridge( |
81 player_id, | 81 player_id, |
82 url, | 82 url, |
83 first_party_for_cookies, | 83 first_party_for_cookies, |
84 user_agent, | 84 user_agent, |
85 hide_url_log, | 85 hide_url_log, |
86 manager, | 86 manager, |
87 base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested, | 87 base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested, |
88 weak_ptr_factory_.GetWeakPtr()), | 88 weak_ptr_factory_.GetWeakPtr()), |
89 base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesReleased, | 89 base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesReleased, |
(...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
879 if (player && player->IsSurfaceInUse()) | 879 if (player && player->IsSurfaceInUse()) |
880 return; | 880 return; |
881 ExternalVideoSurfaceContainer* surface_container = | 881 ExternalVideoSurfaceContainer* surface_container = |
882 ExternalVideoSurfaceContainer::FromWebContents(web_contents_); | 882 ExternalVideoSurfaceContainer::FromWebContents(web_contents_); |
883 if (surface_container) | 883 if (surface_container) |
884 surface_container->ReleaseExternalVideoSurface(player_id); | 884 surface_container->ReleaseExternalVideoSurface(player_id); |
885 #endif // defined(VIDEO_HOLE) | 885 #endif // defined(VIDEO_HOLE) |
886 } | 886 } |
887 | 887 |
888 } // namespace content | 888 } // namespace content |
OLD | NEW |