content/browser/android/browser_jni_registrar.cc - Issue 1110833004: Move audio focus control from media/ to content/ and make it per WebContents.

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: content/browser/android/browser_jni_registrar.cc

Issue 1110833004: Move audio focus control from media/ to content/ and make it per WebContents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/MultipleVideosTest.java ('k') | content/browser/media/android/browser_media_player_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/browser_jni_registrar.cc

diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc

index c6844c19161ef2e86a54d1de56ccec76454b4b24..866188504f05b595d57d9e710a8d3da1d755f179 100644

--- a/content/browser/android/browser_jni_registrar.cc

+++ b/content/browser/android/browser_jni_registrar.cc

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

#include "content/browser/geolocation/location_api_adapter_android.h"

#include "content/browser/media/android/media_drm_credential_manager.h"

#include "content/browser/media/android/media_resource_getter_impl.h"

+#include "content/browser/media/android/media_session.h"

#include "content/browser/mojo/service_registrar_android.h"

#include "content/browser/mojo/service_registry_android.h"

#include "content/browser/power_save_blocker_android.h"

@@ -72,6 +73,7 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {

content::MediaDrmCredentialManager::RegisterMediaDrmCredentialManager},

{"MediaResourceGetterImpl",

content::MediaResourceGetterImpl::RegisterMediaResourceGetter},

+ {"MediaSession", content::MediaSession::RegisterMediaSession},

{"MotionEventAndroid",

content::MotionEventAndroid::RegisterMotionEventAndroid},

{"NavigationControllerAndroid",