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

Side by Side Diff: content/browser/media/session/audio_focus_delegate_android.h

Issue 2416853005: Fixing naming issues in MediaSession (Closed)
Patch Set: owners 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 #ifndef CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_DELEGATE_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_SESSION_AUDIO_FOCUS_DELEGATE_ANDROID_H_
6 #define CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_DELEGATE_ANDROID_H_ 6 #define CONTENT_BROWSER_MEDIA_SESSION_AUDIO_FOCUS_DELEGATE_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
11 #include "content/browser/media/session/media_session_delegate.h" 11 #include "content/browser/media/session/audio_focus_delegate.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 // MediaSessionDelegateAndroid handles the audio focus at a system level on 15 // AudioFocusDelegateAndroid handles the audio focus at a system level on
16 // Android. It is also proxying the JNI calls. 16 // Android. It is also proxying the JNI calls.
17 class MediaSessionDelegateAndroid : public MediaSessionDelegate { 17 class AudioFocusDelegateAndroid : public AudioFocusDelegate {
18 public: 18 public:
19 static bool Register(JNIEnv* env); 19 static bool Register(JNIEnv* env);
20 20
21 explicit MediaSessionDelegateAndroid(MediaSession* media_session); 21 explicit AudioFocusDelegateAndroid(MediaSession* media_session);
22 ~MediaSessionDelegateAndroid() override; 22 ~AudioFocusDelegateAndroid() override;
23 23
24 void Initialize(); 24 void Initialize();
25 25
26 bool RequestAudioFocus( 26 bool RequestAudioFocus(
27 AudioFocusManager::AudioFocusType audio_focus_type) override; 27 AudioFocusManager::AudioFocusType audio_focus_type) override;
28 void AbandonAudioFocus() override; 28 void AbandonAudioFocus() override;
29 29
30 // Called when the Android system requests the MediaSession to be suspended. 30 // Called when the Android system requests the MediaSession to be suspended.
31 // Called by Java through JNI. 31 // Called by Java through JNI.
32 void OnSuspend(JNIEnv* env, 32 void OnSuspend(JNIEnv* env,
33 const base::android::JavaParamRef<jobject>& obj, 33 const base::android::JavaParamRef<jobject>& obj,
34 jboolean temporary); 34 jboolean temporary);
35 35
36 // Called when the Android system requests the MediaSession to be resumed. 36 // Called when the Android system requests the MediaSession to be resumed.
37 // Called by Java through JNI. 37 // Called by Java through JNI.
38 void OnResume(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); 38 void OnResume(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
39 39
40 // Called when the Android system requests the MediaSession to start ducking. 40 // Called when the Android system requests the MediaSession to start ducking.
41 // Called by Java through JNI. 41 // Called by Java through JNI.
42 void OnStartDucking(JNIEnv* env, jobject obj); 42 void OnStartDucking(JNIEnv* env, jobject obj);
43 43
44 // Called when the Android system requests the MediaSession to stop ducking. 44 // Called when the Android system requests the MediaSession to stop ducking.
45 // Called by Java through JNI. 45 // Called by Java through JNI.
46 void OnStopDucking(JNIEnv* env, jobject obj); 46 void OnStopDucking(JNIEnv* env, jobject obj);
47 47
48 // Record when the Android system requests the MediaSession to duck. 48 // Record when the Android system requests the MediaSession to duck.
49 // Called by Java through JNI. 49 // Called by Java through JNI.
50 void RecordSessionDuck(JNIEnv* env, 50 void RecordSessionDuck(JNIEnv* env,
51 const base::android::JavaParamRef<jobject> &obj); 51 const base::android::JavaParamRef<jobject>& obj);
52 52
53 private: 53 private:
54 // Weak pointer because |this| is owned by |media_session_|. 54 // Weak pointer because |this| is owned by |media_session_|.
55 MediaSession* media_session_; 55 MediaSession* media_session_;
56 base::android::ScopedJavaGlobalRef<jobject> j_media_session_delegate_; 56 base::android::ScopedJavaGlobalRef<jobject> j_media_session_delegate_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(MediaSessionDelegateAndroid); 58 DISALLOW_COPY_AND_ASSIGN(AudioFocusDelegateAndroid);
59 }; 59 };
60 60
61 } // namespace content 61 } // namespace content
62 62
63 #endif // CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_DELEGATE_ANDROID_H_ 63 #endif // CONTENT_BROWSER_MEDIA_SESSION_AUDIO_FOCUS_DELEGATE_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698