Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Side by Side Diff: content/browser/media/session/media_session_delegate_default.cc

Issue 2274013005: Flash joining MediaSession (non-stack implementation) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media_session_type
Patch Set: Created 4 years, 3 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 unified diff | Download patch
« no previous file with comments | « content/browser/media/session/media_session_delegate.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/media/session/media_session_delegate.h" 5 #include "content/browser/media/session/media_session_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "content/browser/media/session/audio_focus_manager.h" 8 #include "content/browser/media/session/audio_focus_manager.h"
9 #include "media/base/media_switches.h" 9 #include "media/base/media_switches.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 using AudioFocusType = AudioFocusManager::AudioFocusType; 13 using AudioFocusType = AudioFocusManager::AudioFocusType;
14 14
15 namespace { 15 namespace {
16 16
17 // MediaSessionDelegateDefault is the default implementation of 17 // MediaSessionDelegateDefault is the default implementation of
18 // MediaSessionDelegate which only handles audio focus between WebContents. 18 // MediaSessionDelegate which only handles audio focus between WebContents.
19 class MediaSessionDelegateDefault : public MediaSessionDelegate { 19 class MediaSessionDelegateDefault : public MediaSessionDelegate {
20 public: 20 public:
21 explicit MediaSessionDelegateDefault(MediaSession* media_session); 21 explicit MediaSessionDelegateDefault(MediaSession* media_session);
22 22
23 // MediaSessionDelegate implementation. 23 // MediaSessionDelegate implementation.
24 bool RequestAudioFocus( 24 bool RequestAudioFocus(
25 AudioFocusManager::AudioFocusType audio_focus_type) override; 25 AudioFocusManager::AudioFocusType audio_focus_type) override;
26 void AbandonAudioFocus() override; 26 void AbandonAudioFocus() override;
27 27
28 bool RequestPepperAudioFocus() override;
29 void AbandonPepperAudioFocus() override;
30
28 private: 31 private:
29 // Weak pointer because |this| is owned by |media_session_|. 32 // Weak pointer because |this| is owned by |media_session_|.
30 MediaSession* media_session_; 33 MediaSession* media_session_;
31 }; 34 };
32 35
33 } // anonymous namespace 36 } // anonymous namespace
34 37
35 MediaSessionDelegateDefault::MediaSessionDelegateDefault( 38 MediaSessionDelegateDefault::MediaSessionDelegateDefault(
36 MediaSession* media_session) 39 MediaSession* media_session)
37 : media_session_(media_session) { 40 : media_session_(media_session) {
38 } 41 }
39 42
40 bool MediaSessionDelegateDefault::RequestAudioFocus( 43 bool MediaSessionDelegateDefault::RequestAudioFocus(
41 AudioFocusManager::AudioFocusType audio_focus_type) { 44 AudioFocusManager::AudioFocusType audio_focus_type) {
42 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( 45 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
43 switches::kEnableDefaultMediaSession)) { 46 switches::kEnableDefaultMediaSession)) {
44 return true; 47 return true;
45 } 48 }
46 49
47 AudioFocusManager::GetInstance()->RequestAudioFocus(media_session_, 50 AudioFocusManager::GetInstance()->RequestAudioFocus(media_session_,
48 audio_focus_type); 51 audio_focus_type);
49 return true; 52 return true;
50 } 53 }
51 54
55 bool MediaSessionDelegateDefault::RequestPepperAudioFocus() {
56 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
57 switches::kEnableDefaultMediaSession)) {
58 return true;
59 }
60
61 AudioFocusManager::GetInstance()->RequestPepperAudioFocus(media_session_);
62 return true;
63 }
64
52 void MediaSessionDelegateDefault::AbandonAudioFocus() { 65 void MediaSessionDelegateDefault::AbandonAudioFocus() {
53 AudioFocusManager::GetInstance()->AbandonAudioFocus(media_session_); 66 AudioFocusManager::GetInstance()->AbandonAudioFocus(media_session_);
54 } 67 }
55 68
69 void MediaSessionDelegateDefault::AbandonPepperAudioFocus() {
70 AudioFocusManager::GetInstance()->AbandonPepperAudioFocus(media_session_);
71 }
72
56 // static 73 // static
57 std::unique_ptr<MediaSessionDelegate> MediaSessionDelegate::Create( 74 std::unique_ptr<MediaSessionDelegate> MediaSessionDelegate::Create(
58 MediaSession* media_session) { 75 MediaSession* media_session) {
59 return std::unique_ptr<MediaSessionDelegate>( 76 return std::unique_ptr<MediaSessionDelegate>(
60 new MediaSessionDelegateDefault(media_session)); 77 new MediaSessionDelegateDefault(media_session));
61 } 78 }
62 79
63 } // namespace content 80 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/session/media_session_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698