| 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 9568bc6a954ce321dc68e06e10cdee8a40b10de3..fbf559940fc6eb4cccf3722aa346ffbbad5d80fc 100644
|
| --- a/chrome/app/android/chrome_main_delegate_android.cc
|
| +++ b/chrome/app/android/chrome_main_delegate_android.cc
|
| @@ -14,7 +14,6 @@
|
| #include "chrome/browser/android/chrome_startup_flags.h"
|
| #include "chrome/browser/android/metrics/uma_utils.h"
|
| #include "chrome/browser/android/metrics/uma_utils.h"
|
| -#include "chrome/browser/media/android/remote/remote_media_player_manager.h"
|
| #include "components/policy/core/browser/android/android_combined_policy_provider.h"
|
| #include "components/startup_metric_utils/browser/startup_metric_utils.h"
|
| #include "content/browser/media/android/browser_media_player_manager.h"
|
| @@ -25,12 +24,18 @@
|
| using safe_browsing::SafeBrowsingApiHandler;
|
| #endif
|
|
|
| +#if !defined(USE_AURA)
|
| +#include "chrome/browser/media/android/remote/remote_media_player_manager.h"
|
| +#endif
|
| +
|
| namespace {
|
|
|
| +#if !defined(USE_AURA)
|
| content::BrowserMediaPlayerManager* CreateRemoteMediaPlayerManager(
|
| content::RenderFrameHost* render_frame_host) {
|
| return new remote_media::RemoteMediaPlayerManager(render_frame_host);
|
| }
|
| +#endif
|
|
|
| } // namespace
|
|
|
| @@ -51,8 +56,10 @@ bool ChromeMainDelegateAndroid::BasicStartupComplete(int* exit_code) {
|
|
|
| policy::android::AndroidCombinedPolicyProvider::SetShouldWaitForPolicy(true);
|
| SetChromeSpecificCommandLineFlags();
|
| +#if !defined(USE_AURA)
|
| content::BrowserMediaPlayerManager::RegisterFactory(
|
| &CreateRemoteMediaPlayerManager);
|
| +#endif
|
|
|
| return ChromeMainDelegate::BasicStartupComplete(exit_code);
|
| }
|
|
|