| 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 "chrome/app/android/chrome_main_delegate_android.h" | 5 #include "chrome/app/android/chrome_main_delegate_android.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/trace_event/trace_event.h" | 8 #include "base/trace_event/trace_event.h" |
| 9 #include "chrome/browser/android/chrome_startup_flags.h" | 9 #include "chrome/browser/android/chrome_startup_flags.h" |
| 10 #include "chrome/browser/android/metrics/uma_utils.h" | 10 #include "chrome/browser/android/metrics/uma_utils.h" |
| 11 #include "chrome/browser/android/metrics/uma_utils.h" | 11 #include "chrome/browser/android/metrics/uma_utils.h" |
| 12 #include "chrome/browser/media/android/remote/remote_media_player_manager.h" | 12 #include "chrome/browser/media/android/remote/remote_media_player_manager.h" |
| 13 #include "components/startup_metric_utils/startup_metric_utils.h" | 13 #include "components/startup_metric_utils/startup_metric_utils.h" |
| 14 #include "content/browser/media/android/browser_media_player_manager.h" | 14 #include "content/browser/media/android/browser_media_player_manager.h" |
| 15 #include "content/public/browser/browser_main_runner.h" | 15 #include "content/public/browser/browser_main_runner.h" |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 content::BrowserMediaPlayerManager* CreateRemoteMediaPlayerManager( | 19 content::BrowserMediaPlayerManager* CreateRemoteMediaPlayerManager( |
| 20 content::RenderFrameHost* render_frame_host, | 20 content::RenderFrameHost* render_frame_host) { |
| 21 content::MediaPlayersObserver* audio_monitor) { | 21 return new remote_media::RemoteMediaPlayerManager(render_frame_host); |
| 22 return new remote_media::RemoteMediaPlayerManager(render_frame_host, | |
| 23 audio_monitor); | |
| 24 } | 22 } |
| 25 | 23 |
| 26 } // namespace | 24 } // namespace |
| 27 | 25 |
| 28 // ChromeMainDelegateAndroid is created when the library is loaded. It is always | 26 // ChromeMainDelegateAndroid is created when the library is loaded. It is always |
| 29 // done in the process's main Java thread. But for non browser process, e.g. | 27 // done in the process's main Java thread. But for non browser process, e.g. |
| 30 // renderer process, it is not the native Chrome's main thread. | 28 // renderer process, it is not the native Chrome's main thread. |
| 31 ChromeMainDelegateAndroid::ChromeMainDelegateAndroid() { | 29 ChromeMainDelegateAndroid::ChromeMainDelegateAndroid() { |
| 32 } | 30 } |
| 33 | 31 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 61 } | 59 } |
| 62 | 60 |
| 63 bool ChromeMainDelegateAndroid::BasicStartupComplete(int* exit_code) { | 61 bool ChromeMainDelegateAndroid::BasicStartupComplete(int* exit_code) { |
| 64 SetChromeSpecificCommandLineFlags(); | 62 SetChromeSpecificCommandLineFlags(); |
| 65 | 63 |
| 66 content::BrowserMediaPlayerManager::RegisterFactory( | 64 content::BrowserMediaPlayerManager::RegisterFactory( |
| 67 &CreateRemoteMediaPlayerManager); | 65 &CreateRemoteMediaPlayerManager); |
| 68 | 66 |
| 69 return ChromeMainDelegate::BasicStartupComplete(exit_code); | 67 return ChromeMainDelegate::BasicStartupComplete(exit_code); |
| 70 } | 68 } |
| OLD | NEW |