content/browser/media/android/browser_media_player_manager.cc - Issue 1159113006: [Android] A prototype of the interactive media notification.

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/media/android/browser_media_player_manager.cc

Issue 1159113006: [Android] A prototype of the interactive media notification. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased the change Created 5 years, 6 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 | « chrome/browser/android/chrome_web_contents_delegate_android.cc ('k') | content/browser/media/android/media_session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/android/browser_media_player_manager.cc

diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc

index 3ea4de85bd3508787368c8a13bc2034fdc8a373e..ad0b1a51d8c40db8bf3eb811554fc87355bedb6c 100644

--- a/content/browser/media/android/browser_media_player_manager.cc

+++ b/content/browser/media/android/browser_media_player_manager.cc

@@ -285,6 +285,7 @@ void BrowserMediaPlayerManager::OnMediaMetadataChanged(

void BrowserMediaPlayerManager::OnPlaybackComplete(int player_id) {

Send(new MediaPlayerMsg_MediaPlaybackCompleted(RoutingID(), player_id));

MediaSession::Get(web_contents())->RemovePlayer(this, player_id);

if (fullscreen_player_id_ == player_id)

@@ -572,7 +573,8 @@ void BrowserMediaPlayerManager::OnPause(

if (player)

player->Pause(is_media_related_action);

- MediaSession::Get(web_contents())->RemovePlayer(this, player_id);

+ if (is_media_related_action)

+ MediaSession::Get(web_contents())->RemovePlayer(this, player_id);

}

void BrowserMediaPlayerManager::OnSetVolume(int player_id, double volume) {

« no previous file with comments | « chrome/browser/android/chrome_web_contents_delegate_android.cc ('k') | content/browser/media/android/media_session.h » ('j') | no next file with comments »