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

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

Issue 2416853005: Fixing naming issues in MediaSession (Closed)
Patch Set: addressed nits Created 4 years, 2 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
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/audio_focus_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 // AudioFocusDelegateDefault is the default implementation of
18 // MediaSessionDelegate which only handles audio focus between WebContents. 18 // AudioFocusDelegate which only handles audio focus between WebContents.
19 class MediaSessionDelegateDefault : public MediaSessionDelegate { 19 class AudioFocusDelegateDefault : public AudioFocusDelegate {
20 public: 20 public:
21 explicit MediaSessionDelegateDefault(MediaSession* media_session); 21 explicit AudioFocusDelegateDefault(MediaSession* media_session);
22 ~MediaSessionDelegateDefault() override; 22 ~AudioFocusDelegateDefault() override;
23 23
24 // MediaSessionDelegate implementation. 24 // AudioFocusDelegate implementation.
25 bool RequestAudioFocus( 25 bool RequestAudioFocus(
26 AudioFocusManager::AudioFocusType audio_focus_type) override; 26 AudioFocusManager::AudioFocusType audio_focus_type) override;
27 void AbandonAudioFocus() override; 27 void AbandonAudioFocus() override;
28 28
29 private: 29 private:
30 // Weak pointer because |this| is owned by |media_session_|. 30 // Weak pointer because |this| is owned by |media_session_|.
31 MediaSession* media_session_; 31 MediaSession* media_session_;
32 }; 32 };
33 33
34 } // anonymous namespace 34 } // anonymous namespace
35 35
36 MediaSessionDelegateDefault::MediaSessionDelegateDefault( 36 AudioFocusDelegateDefault::AudioFocusDelegateDefault(
37 MediaSession* media_session) 37 MediaSession* media_session)
38 : media_session_(media_session) { 38 : media_session_(media_session) {}
39 }
40 39
41 MediaSessionDelegateDefault::~MediaSessionDelegateDefault() = default; 40 AudioFocusDelegateDefault::~AudioFocusDelegateDefault() = default;
42 41
43 bool MediaSessionDelegateDefault::RequestAudioFocus( 42 bool AudioFocusDelegateDefault::RequestAudioFocus(
44 AudioFocusManager::AudioFocusType audio_focus_type) { 43 AudioFocusManager::AudioFocusType audio_focus_type) {
45 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( 44 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
46 switches::kEnableDefaultMediaSession)) { 45 switches::kEnableDefaultMediaSession)) {
47 return true; 46 return true;
48 } 47 }
49 48
50 AudioFocusManager::GetInstance()->RequestAudioFocus(media_session_, 49 AudioFocusManager::GetInstance()->RequestAudioFocus(media_session_,
51 audio_focus_type); 50 audio_focus_type);
52 return true; 51 return true;
53 } 52 }
54 53
55 void MediaSessionDelegateDefault::AbandonAudioFocus() { 54 void AudioFocusDelegateDefault::AbandonAudioFocus() {
56 AudioFocusManager::GetInstance()->AbandonAudioFocus(media_session_); 55 AudioFocusManager::GetInstance()->AbandonAudioFocus(media_session_);
57 } 56 }
58 57
59 // static 58 // static
60 std::unique_ptr<MediaSessionDelegate> MediaSessionDelegate::Create( 59 std::unique_ptr<AudioFocusDelegate> AudioFocusDelegate::Create(
61 MediaSession* media_session) { 60 MediaSession* media_session) {
62 return std::unique_ptr<MediaSessionDelegate>( 61 return std::unique_ptr<AudioFocusDelegate>(
63 new MediaSessionDelegateDefault(media_session)); 62 new AudioFocusDelegateDefault(media_session));
64 } 63 }
65 64
66 } // namespace content 65 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698