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 8132f3ea3803e4c22fb3816756ce0f541dcc5d31..c0cc7e75a9be8548f67f9a080ed0098a97658494 100644 |
--- a/content/browser/media/session/pepper_playback_observer.cc |
+++ b/content/browser/media/session/pepper_playback_observer.cc |
@@ -46,8 +46,11 @@ void PepperPlaybackObserver::PepperInstanceDeleted(int32_t pp_instance) { |
void PepperPlaybackObserver::PepperStartsPlayback(int32_t pp_instance) { |
xhwang
2016/10/18 17:26:59
OOC, what is defined as a "pepper playback"? peppe
Zhiqiang Zhang (Slow)
2016/10/18 18:51:54
It's a pepper plugin instance producing audio.
xhwang
2016/10/18 20:25:08
Could you please add a comment somewhere? IMHO the
Zhiqiang Zhang (Slow)
2016/10/19 10:22:20
Done.
|
players_played_sound_map_[pp_instance] = true; |
- if (!base::FeatureList::IsEnabled(media::kFlashJoinsMediaSession)) |
+ if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
+ switches::kEnableDefaultMediaSession) != |
+ switches::kEnableDefaultMediaSessionWithFlash) { |
return; |
+ } |
if (players_map_.count(pp_instance)) |
return; |