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 "content/browser/android/media_player_manager_impl.h" | 5 #include "content/browser/android/media_player_manager_impl.h" |
6 | 6 |
7 #include "content/browser/android/media_resource_getter_impl.h" | 7 #include "content/browser/android/media_resource_getter_impl.h" |
8 #include "content/browser/web_contents/web_contents_view_android.h" | 8 #include "content/browser/web_contents/web_contents_view_android.h" |
9 #include "content/common/media/media_player_messages.h" | 9 #include "content/common/media/media_player_messages.h" |
10 #include "content/public/browser/browser_context.h" | 10 #include "content/public/browser/browser_context.h" |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
97 void MediaPlayerManagerImpl::SetVideoSurface(jobject surface) { | 97 void MediaPlayerManagerImpl::SetVideoSurface(jobject surface) { |
98 MediaPlayerAndroid* player = GetFullscreenPlayer(); | 98 MediaPlayerAndroid* player = GetFullscreenPlayer(); |
99 if (player) { | 99 if (player) { |
100 player->SetVideoSurface(surface); | 100 player->SetVideoSurface(surface); |
101 Send(new MediaPlayerMsg_DidEnterFullscreen( | 101 Send(new MediaPlayerMsg_DidEnterFullscreen( |
102 routing_id(), player->player_id())); | 102 routing_id(), player->player_id())); |
103 } | 103 } |
104 } | 104 } |
105 | 105 |
106 void MediaPlayerManagerImpl::OnInitialize( | 106 void MediaPlayerManagerImpl::OnInitialize( |
107 int player_id, const GURL& url, | 107 int player_id, |
108 bool is_media_source, | 108 const GURL& url, |
109 media::MediaPlayerAndroid::SourceType media_source_type, | |
acolwell GONE FROM CHROMIUM
2013/05/20 21:23:22
nit:s/media_//
wonsik
2013/05/21 10:09:29
Done.
| |
109 const GURL& first_party_for_cookies) { | 110 const GURL& first_party_for_cookies) { |
110 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); | 111 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); |
111 it != players_.end(); ++it) { | 112 it != players_.end(); ++it) { |
112 if ((*it)->player_id() == player_id) { | 113 if ((*it)->player_id() == player_id) { |
113 players_.erase(it); | 114 players_.erase(it); |
114 break; | 115 break; |
115 } | 116 } |
116 } | 117 } |
117 | 118 |
118 RenderProcessHost* host = render_view_host()->GetProcess(); | 119 RenderProcessHost* host = render_view_host()->GetProcess(); |
119 players_.push_back(media::MediaPlayerAndroid::Create( | 120 players_.push_back(media::MediaPlayerAndroid::Create( |
120 player_id, url, is_media_source, first_party_for_cookies, | 121 player_id, |
121 host->GetBrowserContext()->IsOffTheRecord(), this)); | 122 url, |
123 media_source_type, | |
124 first_party_for_cookies, | |
125 host->GetBrowserContext()->IsOffTheRecord(), | |
126 this)); | |
122 } | 127 } |
123 | 128 |
124 media::MediaResourceGetter* MediaPlayerManagerImpl::GetMediaResourceGetter() { | 129 media::MediaResourceGetter* MediaPlayerManagerImpl::GetMediaResourceGetter() { |
125 if (!media_resource_getter_.get()) { | 130 if (!media_resource_getter_.get()) { |
126 RenderProcessHost* host = render_view_host()->GetProcess(); | 131 RenderProcessHost* host = render_view_host()->GetProcess(); |
127 BrowserContext* context = host->GetBrowserContext(); | 132 BrowserContext* context = host->GetBrowserContext(); |
128 StoragePartition* partition = host->GetStoragePartition(); | 133 StoragePartition* partition = host->GetStoragePartition(); |
129 fileapi::FileSystemContext* file_system_context = | 134 fileapi::FileSystemContext* file_system_context = |
130 partition ? partition->GetFileSystemContext() : NULL; | 135 partition ? partition->GetFileSystemContext() : NULL; |
131 media_resource_getter_.reset(new MediaResourceGetterImpl( | 136 media_resource_getter_.reset(new MediaResourceGetterImpl( |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
347 } | 352 } |
348 } | 353 } |
349 } | 354 } |
350 | 355 |
351 void MediaPlayerManagerImpl::ReleaseMediaResources( | 356 void MediaPlayerManagerImpl::ReleaseMediaResources( |
352 MediaPlayerAndroid* player) { | 357 MediaPlayerAndroid* player) { |
353 // Nothing needs to be done. | 358 // Nothing needs to be done. |
354 } | 359 } |
355 | 360 |
356 } // namespace content | 361 } // namespace content |
OLD | NEW |