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

Side by Side Diff: chrome/browser/chrome_browser_main_android.cc

Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename createSession to createSessionFromNative to avoid bug in FindBugs Created 5 years, 7 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/browser/chrome_browser_main_android.h ('k') | chrome/chrome_browser.gypi » ('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/browser/chrome_browser_main_android.h" 5 #include "chrome/browser/chrome_browser_main_android.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "chrome/browser/android/chrome_media_client_android.h"
10 #include "chrome/browser/android/seccomp_support_detector.h" 11 #include "chrome/browser/android/seccomp_support_detector.h"
11 #include "chrome/browser/google/google_search_counter_android.h" 12 #include "chrome/browser/google/google_search_counter_android.h"
12 #include "chrome/browser/signin/signin_manager_factory.h" 13 #include "chrome/browser/signin/signin_manager_factory.h"
13 #include "chrome/common/chrome_paths.h" 14 #include "chrome/common/chrome_paths.h"
14 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
15 #include "components/crash/app/breakpad_linux.h" 16 #include "components/crash/app/breakpad_linux.h"
16 #include "components/crash/browser/crash_dump_manager_android.h" 17 #include "components/crash/browser/crash_dump_manager_android.h"
17 #include "components/signin/core/browser/signin_manager.h" 18 #include "components/signin/core/browser/signin_manager.h"
18 #include "content/public/browser/android/compositor.h" 19 #include "content/public/browser/android/compositor.h"
19 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
20 #include "content/public/common/main_function_params.h" 21 #include "content/public/common/main_function_params.h"
22 #include "media/base/android/media_client_android.h"
21 #include "net/android/network_change_notifier_factory_android.h" 23 #include "net/android/network_change_notifier_factory_android.h"
22 #include "net/base/network_change_notifier.h" 24 #include "net/base/network_change_notifier.h"
23 #include "ui/base/ui_base_paths.h" 25 #include "ui/base/ui_base_paths.h"
24 26
25 ChromeBrowserMainPartsAndroid::ChromeBrowserMainPartsAndroid( 27 ChromeBrowserMainPartsAndroid::ChromeBrowserMainPartsAndroid(
26 const content::MainFunctionParams& parameters) 28 const content::MainFunctionParams& parameters)
27 : ChromeBrowserMainParts(parameters) { 29 : ChromeBrowserMainParts(parameters) {
28 } 30 }
29 31
30 ChromeBrowserMainPartsAndroid::~ChromeBrowserMainPartsAndroid() { 32 ChromeBrowserMainPartsAndroid::~ChromeBrowserMainPartsAndroid() {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 91
90 { 92 {
91 TRACE_EVENT0("startup", 93 TRACE_EVENT0("startup",
92 "ChromeBrowserMainPartsAndroid::PreEarlyInitialization:StartUiMsgLoop"); 94 "ChromeBrowserMainPartsAndroid::PreEarlyInitialization:StartUiMsgLoop");
93 base::MessageLoopForUI::current()->Start(); 95 base::MessageLoopForUI::current()->Start();
94 } 96 }
95 97
96 ChromeBrowserMainParts::PreEarlyInitialization(); 98 ChromeBrowserMainParts::PreEarlyInitialization();
97 } 99 }
98 100
101 void ChromeBrowserMainPartsAndroid::PreMainMessageLoopRun() {
102 media::SetMediaClientAndroid(new ChromeMediaClientAndroid);
103
104 ChromeBrowserMainParts::PreMainMessageLoopRun();
105 }
106
99 void ChromeBrowserMainPartsAndroid::PostBrowserStart() { 107 void ChromeBrowserMainPartsAndroid::PostBrowserStart() {
100 ChromeBrowserMainParts::PostBrowserStart(); 108 ChromeBrowserMainParts::PostBrowserStart();
101 109
102 content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE, 110 content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE,
103 base::Bind(&SeccompSupportDetector::StartDetection), 111 base::Bind(&SeccompSupportDetector::StartDetection),
104 base::TimeDelta::FromMinutes(1)); 112 base::TimeDelta::FromMinutes(1));
105 } 113 }
106 114
107 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() { 115 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() {
108 NOTREACHED(); 116 NOTREACHED();
109 } 117 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_android.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698