chrome/browser/chrome_browser_main_android.cc - Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: added components/cdm OWNERS to components/cdm.gypi (per-file) Created 5 years, 8 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 side-by-side diff with in-line comments

Download patch

« android_webview/java/src/org/chromium/android_webview/AwResource.java ('K') | « chrome/browser/android/chrome_media_client_android.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_browser_main_android.cc

diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc

index 9f977fc83f481ccddc7c1b7e1bb9377a8fa2b536..a1587fedbccaaa54f8404dd59ae1cf5ebc711264 100644

--- a/chrome/browser/chrome_browser_main_android.cc

+++ b/chrome/browser/chrome_browser_main_android.cc

@@ -7,6 +7,7 @@

#include "base/command_line.h"

#include "base/path_service.h"

#include "base/trace_event/trace_event.h"

+#include "chrome/browser/android/chrome_media_client_android.h"

#include "chrome/browser/android/seccomp_support_detector.h"

#include "chrome/browser/google/google_search_counter_android.h"

#include "chrome/browser/signin/signin_manager_factory.h"

@@ -18,6 +19,7 @@

#include "content/public/browser/android/compositor.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/common/main_function_params.h"

+#include "media/base/android/media_client_android.h"

#include "net/android/network_change_notifier_factory_android.h"

#include "net/base/network_change_notifier.h"

#include "ui/base/ui_base_paths.h"

@@ -74,6 +76,7 @@ void ChromeBrowserMainPartsAndroid::PreEarlyInitialization() {

new net::NetworkChangeNotifierFactoryAndroid());

content::Compositor::Initialize();

+ media::SetMediaClientAndroid(new ChromeMediaClientAndroid);

// Chrome on Android does not use default MessageLoop. It has its own

// Android specific MessageLoop.