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

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

Issue 2479603003: Revert of Adding new media controls to MediaNotification (Closed)
Patch Set: Created 4 years, 1 month 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_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_ANDROID_H_
6 #define CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_ANDROID_H_ 6 #define CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
(...skipping 21 matching lines...) Expand all
32 32
33 explicit MediaSessionAndroid(MediaSessionImpl* session); 33 explicit MediaSessionAndroid(MediaSessionImpl* session);
34 ~MediaSessionAndroid() override; 34 ~MediaSessionAndroid() override;
35 35
36 // MediaSessionObserver implementation. 36 // MediaSessionObserver implementation.
37 void MediaSessionDestroyed() override; 37 void MediaSessionDestroyed() override;
38 void MediaSessionStateChanged(bool is_controllable, 38 void MediaSessionStateChanged(bool is_controllable,
39 bool is_suspended) override; 39 bool is_suspended) override;
40 void MediaSessionMetadataChanged( 40 void MediaSessionMetadataChanged(
41 const base::Optional<MediaMetadata>& metadata) override; 41 const base::Optional<MediaMetadata>& metadata) override;
42 void MediaSessionEnabledAction(
43 blink::mojom::MediaSessionAction action) override;
44 void MediaSessionDisabledAction(
45 blink::mojom::MediaSessionAction action) override;
46 42
47 // MediaSession method wrappers. 43 // MediaSession method wrappers.
48 void Resume(JNIEnv* env, const base::android::JavaParamRef<jobject>& j_obj); 44 void Resume(JNIEnv* env, const base::android::JavaParamRef<jobject>& j_obj);
49 void Suspend(JNIEnv* env, const base::android::JavaParamRef<jobject>& j_obj); 45 void Suspend(JNIEnv* env, const base::android::JavaParamRef<jobject>& j_obj);
50 void Stop(JNIEnv* env, const base::android::JavaParamRef<jobject>& j_obj); 46 void Stop(JNIEnv* env, const base::android::JavaParamRef<jobject>& j_obj);
51 void DidReceiveAction(JNIEnv* env,
52 const base::android::JavaParamRef<jobject>& j_obj,
53 jint action);
54 47
55 private: 48 private:
56 WebContentsAndroid* GetWebContentsAndroid(); 49 WebContentsAndroid* GetWebContentsAndroid();
57 50
58 base::android::ScopedJavaLocalRef<jobject> GetJavaObject(); 51 base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
59 52
60 // The linked Java object. The strong reference is hold by Java WebContensImpl 53 // The linked Java object. The strong reference is hold by Java WebContensImpl
61 // to avoid introducing a new GC root. 54 // to avoid introducing a new GC root.
62 JavaObjectWeakGlobalRef j_media_session_; 55 JavaObjectWeakGlobalRef j_media_session_;
63 56
64 DISALLOW_COPY_AND_ASSIGN(MediaSessionAndroid); 57 DISALLOW_COPY_AND_ASSIGN(MediaSessionAndroid);
65 }; 58 };
66 59
67 } // namespace content 60 } // namespace content
68 61
69 #endif // CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_ANDROID_H_ 62 #endif // CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/android/java/strings/android_chrome_strings.grd ('k') | content/browser/media/session/media_session_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698