Index: content/browser/media/session/media_session_delegate_default.cc |
diff --git a/content/browser/media/session/media_session_delegate_default.cc b/content/browser/media/session/media_session_delegate_default.cc |
index 8a3db14fb2dc84a55ec612b4d849bd8f350ee0cc..26a8bccacb2a8b2692fd54bdd753ab420f307795 100644 |
--- a/content/browser/media/session/media_session_delegate_default.cc |
+++ b/content/browser/media/session/media_session_delegate_default.cc |
@@ -21,7 +21,7 @@ class MediaSessionDelegateDefault : public MediaSessionDelegate { |
explicit MediaSessionDelegateDefault(MediaSession* media_session); |
// MediaSessionDelegate implementation. |
- bool RequestAudioFocus(MediaSession::Type type) override; |
+ bool RequestAudioFocus(AudioFocusManager::AudioFocusType type) override; |
void AbandonAudioFocus() override; |
private: |
@@ -36,16 +36,14 @@ MediaSessionDelegateDefault::MediaSessionDelegateDefault( |
: media_session_(media_session) { |
} |
-bool MediaSessionDelegateDefault::RequestAudioFocus(MediaSession::Type type) { |
+bool MediaSessionDelegateDefault::RequestAudioFocus( |
+ AudioFocusManager::AudioFocusType type) { |
whywhat
2016/08/18 20:33:42
nit: perhaps use |media_content_type| or |audio_fo
Zhiqiang Zhang (Slow)
2016/08/19 15:05:55
Done.
|
if (!base::CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kEnableDefaultMediaSession)) { |
return true; |
} |
- AudioFocusManager::GetInstance()->RequestAudioFocus( |
- media_session_, type == MediaSession::Type::Content |
- ? AudioFocusType::Gain |
- : AudioFocusType::GainTransientMayDuck); |
+ AudioFocusManager::GetInstance()->RequestAudioFocus(media_session_, type); |
return true; |
} |