Index: chrome/app/android/chrome_main_delegate_android.cc |
diff --git a/chrome/app/android/chrome_main_delegate_android.cc b/chrome/app/android/chrome_main_delegate_android.cc |
index e0bd8e477784665ad0489d79f5a16572d5b0d38c..f1c5e5c99e3488f694a250619d96ca609988a72c 100644 |
--- a/chrome/app/android/chrome_main_delegate_android.cc |
+++ b/chrome/app/android/chrome_main_delegate_android.cc |
@@ -8,8 +8,10 @@ |
#include "base/trace_event/trace_event.h" |
#include "chrome/browser/android/chrome_jni_registrar.h" |
#include "chrome/browser/android/chrome_startup_flags.h" |
+#include "chrome/browser/media/android/remote/remote_media_player_manager.h" |
#include "chrome/browser/android/uma_utils.h" |
#include "components/startup_metric_utils/startup_metric_utils.h" |
+#include "content/browser/media/android/browser_media_player_manager.h" |
#include "content/public/browser/browser_main_runner.h" |
// ChromeMainDelegateAndroid is created when the library is loaded. It is always |
@@ -20,6 +22,10 @@ ChromeMainDelegateAndroid::ChromeMainDelegateAndroid() { |
ChromeMainDelegateAndroid::~ChromeMainDelegateAndroid() { |
} |
+static content::BrowserMediaPlayerManager* CreateRemoteMediaPlayerManager( |
+ content::RenderFrameHost* render_frame_host) { |
+ return new remote_media::RemoteMediaPlayerManager(render_frame_host); |
+} |
void ChromeMainDelegateAndroid::SandboxInitialized( |
const std::string& process_type) { |
@@ -53,6 +59,10 @@ int ChromeMainDelegateAndroid::RunProcess( |
bool ChromeMainDelegateAndroid::BasicStartupComplete(int* exit_code) { |
SetChromeSpecificCommandLineFlags(); |
+ |
+ content::BrowserMediaPlayerManager::RegisterFactory( |
+ &CreateRemoteMediaPlayerManager); |
+ |
return ChromeMainDelegate::BasicStartupComplete(exit_code); |
} |