Chromium Code Reviews| Index: content/browser/media/android/browser_media_player_manager.cc |
| diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc |
| index 79b7983145b8f9b54e1d53c0c18a5edb29fe4e4d..3c7fb807bb89ef166b4d15486b75a005fcbf76cb 100644 |
| --- a/content/browser/media/android/browser_media_player_manager.cc |
| +++ b/content/browser/media/android/browser_media_player_manager.cc |
| @@ -26,6 +26,7 @@ |
| #include "content/public/common/content_switches.h" |
| #include "media/base/android/media_player_bridge.h" |
| #include "media/base/android/media_source_player.h" |
| +#include "media/base/android/media_url_interceptor.h" |
| #include "media/base/media_switches.h" |
| using media::MediaPlayerAndroid; |
| @@ -40,6 +41,7 @@ namespace content { |
| const int kMediaPlayerThreshold = 1; |
| static BrowserMediaPlayerManager::Factory g_factory = NULL; |
| +static media::MediaUrlInterceptor* media_url_interceptor_ = NULL; |
| // static |
| void BrowserMediaPlayerManager::RegisterFactory(Factory factory) { |
| @@ -47,6 +49,12 @@ void BrowserMediaPlayerManager::RegisterFactory(Factory factory) { |
| } |
| // static |
| +void BrowserMediaPlayerManager::RegisterMediaUrlInterceptor( |
| + media::MediaUrlInterceptor* media_url_interceptor) { |
|
qinmin
2014/07/28 21:16:01
fix the indent
Ignacio Solla
2014/07/29 09:03:52
Done.
|
| + media_url_interceptor_ = media_url_interceptor; |
| +} |
| + |
| +// static |
| BrowserMediaPlayerManager* BrowserMediaPlayerManager::Create( |
| RenderFrameHost* rfh) { |
| if (g_factory) |
| @@ -295,6 +303,11 @@ BrowserMediaPlayerManager::GetMediaResourceGetter() { |
| return media_resource_getter_.get(); |
| } |
| +media::MediaUrlInterceptor* |
| +BrowserMediaPlayerManager::GetMediaUrlInterceptor() { |
| + return media_url_interceptor_; |
| +} |
| + |
| MediaPlayerAndroid* BrowserMediaPlayerManager::GetFullscreenPlayer() { |
| return GetPlayer(fullscreen_player_id_); |
| } |