media/base/android/media_player_bridge.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: media/base/android/media_player_bridge.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: review comments and compile 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

« content/public/test/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java ('K') | « media/base/android/java/src/org/chromium/media/MediaPlayerListener.java ('k') | media/base/android/media_player_listener.cc » ('j') | media/base/android/media_source_player.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/android/media_player_bridge.cc

diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc

index ed8854f1b688774a4f00eecca7f4790d88a368b7..29049cb01a7f5f873e01d8484648a5e6c994fe98 100644

--- a/media/base/android/media_player_bridge.cc

+++ b/media/base/android/media_player_bridge.cc

@@ -456,6 +456,11 @@ void MediaPlayerBridge::UpdateAllowedOperations() {

}

void MediaPlayerBridge::StartInternal() {

+ if (!manager()->RequestPlay(player_id())) {

+ Pause(true);

qinmin 2015/05/23 18:16:06 this should be false, see my comments in media_sou

+ return;

+ }

JNIEnv* env = base::android::AttachCurrentThread();

Java_MediaPlayerBridge_start(env, j_media_player_bridge_.obj());

if (!time_update_timer_.IsRunning()) {