content/browser/media/session/pepper_playback_observer.cc - Issue 1996043002: Split MediaContentType and AudioFocusType

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/session/pepper_playback_observer.cc

Issue 1996043002: Split MediaContentType and AudioFocusType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixed desktop build & tests Created 4 years, 5 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:

Index: content/browser/media/session/pepper_playback_observer.cc

diff --git a/content/browser/media/session/pepper_playback_observer.cc b/content/browser/media/session/pepper_playback_observer.cc

index 9411b7fe7a249e0975051b195ca597302204f34e..c88df0a84057a7f62e2200c913a4a2ae001dafa0 100644

--- a/content/browser/media/session/pepper_playback_observer.cc

+++ b/content/browser/media/session/pepper_playback_observer.cc

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

#include "content/browser/media/session/pepper_player_delegate.h"

#include "content/common/frame_messages.h"

#include "ipc/ipc_message_macros.h"

+#include "media/base/media_content_type.h"

#include "media/base/media_switches.h"

namespace content {

@@ -56,7 +57,7 @@ void PepperPlaybackObserver::PepperStartsPlayback(int32_t pp_instance) {

MediaSession::Get(contents_)->AddPlayer(

players_map_[pp_instance].get(),

PepperPlayerDelegate::kPlayerId,

- MediaSession::Type::Content);

+ media::MediaContentType::Unpausable);

}

void PepperPlaybackObserver::PepperStopsPlayback(int32_t pp_instance) {