Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(395)

Side by Side Diff: chrome/app/android/chrome_main_delegate_android.cc

Issue 928643003: Upstream Chrome for Android Cast. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix dependencies (second attempt). Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/app/android/DEPS ('k') | chrome/browser/android/chrome_jni_registrar.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
12 #include "chrome/browser/media/android/remote/remote_media_player_manager.h"
11 #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"
12 #include "content/public/browser/browser_main_runner.h" 15 #include "content/public/browser/browser_main_runner.h"
13 16
17 namespace {
18
19 content::BrowserMediaPlayerManager* CreateRemoteMediaPlayerManager(
20 content::RenderFrameHost* render_frame_host,
21 content::MediaPlayersObserver* audio_monitor) {
22 return new remote_media::RemoteMediaPlayerManager(render_frame_host,
23 audio_monitor);
24 }
25
26 } // namespace
27
14 // ChromeMainDelegateAndroid is created when the library is loaded. It is always 28 // ChromeMainDelegateAndroid is created when the library is loaded. It is always
15 // done in the process's main Java thread. But for non browser process, e.g. 29 // done in the process's main Java thread. But for non browser process, e.g.
16 // renderer process, it is not the native Chrome's main thread. 30 // renderer process, it is not the native Chrome's main thread.
17 ChromeMainDelegateAndroid::ChromeMainDelegateAndroid() { 31 ChromeMainDelegateAndroid::ChromeMainDelegateAndroid() {
18 } 32 }
19 33
20 ChromeMainDelegateAndroid::~ChromeMainDelegateAndroid() { 34 ChromeMainDelegateAndroid::~ChromeMainDelegateAndroid() {
21 } 35 }
22
23 void ChromeMainDelegateAndroid::SandboxInitialized( 36 void ChromeMainDelegateAndroid::SandboxInitialized(
24 const std::string& process_type) { 37 const std::string& process_type) {
25 ChromeMainDelegate::SandboxInitialized(process_type); 38 ChromeMainDelegate::SandboxInitialized(process_type);
26 } 39 }
27 40
28 int ChromeMainDelegateAndroid::RunProcess( 41 int ChromeMainDelegateAndroid::RunProcess(
29 const std::string& process_type, 42 const std::string& process_type,
30 const content::MainFunctionParams& main_function_params) { 43 const content::MainFunctionParams& main_function_params) {
31 TRACE_EVENT0("startup", "ChromeMainDelegateAndroid::RunProcess") 44 TRACE_EVENT0("startup", "ChromeMainDelegateAndroid::RunProcess")
32 if (process_type.empty()) { 45 if (process_type.empty()) {
33 // Because the browser process can be started asynchronously as a series of 46 // Because the browser process can be started asynchronously as a series of
34 // UI thread tasks a second request to start it can come in while the 47 // UI thread tasks a second request to start it can come in while the
35 // first request is still being processed. Chrome must keep the same 48 // first request is still being processed. Chrome must keep the same
36 // browser runner for the second request. 49 // browser runner for the second request.
37 // Also only record the start time the first time round, since this is the 50 // Also only record the start time the first time round, since this is the
38 // start time of the application, and will be same for all requests. 51 // start time of the application, and will be same for all requests.
39 if (!browser_runner_.get()) { 52 if (!browser_runner_.get()) {
40 base::Time startTime = chrome::android::GetMainEntryPointTime(); 53 base::Time startTime = chrome::android::GetMainEntryPointTime();
41 startup_metric_utils::RecordSavedMainEntryPointTime(startTime); 54 startup_metric_utils::RecordSavedMainEntryPointTime(startTime);
42 browser_runner_.reset(content::BrowserMainRunner::Create()); 55 browser_runner_.reset(content::BrowserMainRunner::Create());
43 } 56 }
44 return browser_runner_->Initialize(main_function_params); 57 return browser_runner_->Initialize(main_function_params);
45 } 58 }
46 59
47 return ChromeMainDelegate::RunProcess(process_type, main_function_params); 60 return ChromeMainDelegate::RunProcess(process_type, main_function_params);
48 } 61 }
49 62
50 bool ChromeMainDelegateAndroid::BasicStartupComplete(int* exit_code) { 63 bool ChromeMainDelegateAndroid::BasicStartupComplete(int* exit_code) {
51 SetChromeSpecificCommandLineFlags(); 64 SetChromeSpecificCommandLineFlags();
65
66 content::BrowserMediaPlayerManager::RegisterFactory(
67 &CreateRemoteMediaPlayerManager);
68
52 return ChromeMainDelegate::BasicStartupComplete(exit_code); 69 return ChromeMainDelegate::BasicStartupComplete(exit_code);
53 } 70 }
OLDNEW
« no previous file with comments | « chrome/app/android/DEPS ('k') | chrome/browser/android/chrome_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698