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

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

Issue 2469893007: Reland "Adding 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 #include "content/browser/media/session/media_session_android.h" 5 #include "content/browser/media/session/media_session_android.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include "content/browser/media/session/media_session_impl.h" 8 #include "content/browser/media/session/media_session_impl.h"
9 #include "content/browser/web_contents/web_contents_android.h" 9 #include "content/browser/web_contents/web_contents_android.h"
10 #include "content/browser/web_contents/web_contents_impl.h" 10 #include "content/browser/web_contents/web_contents_impl.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 if (!Java_MediaSessionImpl_hasObservers(env, j_local_session)) 96 if (!Java_MediaSessionImpl_hasObservers(env, j_local_session))
97 return; 97 return;
98 98
99 ScopedJavaLocalRef<jobject> j_metadata; 99 ScopedJavaLocalRef<jobject> j_metadata;
100 if (metadata.has_value()) 100 if (metadata.has_value())
101 j_metadata = MediaMetadataAndroid::CreateJavaObject(env, metadata.value()); 101 j_metadata = MediaMetadataAndroid::CreateJavaObject(env, metadata.value());
102 Java_MediaSessionImpl_mediaSessionMetadataChanged(env, j_local_session, 102 Java_MediaSessionImpl_mediaSessionMetadataChanged(env, j_local_session,
103 j_metadata); 103 j_metadata);
104 } 104 }
105 105
106 void MediaSessionAndroid::MediaSessionEnabledAction(
107 blink::mojom::MediaSessionAction action) {
108 ScopedJavaLocalRef<jobject> j_local_session = GetJavaObject();
109 if (j_local_session.is_null())
110 return;
111
112 JNIEnv* env = base::android::AttachCurrentThread();
113 Java_MediaSessionImpl_mediaSessionEnabledAction(env, j_local_session,
114 static_cast<int>(action));
115 }
116
117 void MediaSessionAndroid::MediaSessionDisabledAction(
118 blink::mojom::MediaSessionAction action) {
119 ScopedJavaLocalRef<jobject> j_local_session = GetJavaObject();
120 if (j_local_session.is_null())
121 return;
122
123 JNIEnv* env = base::android::AttachCurrentThread();
124 Java_MediaSessionImpl_mediaSessionDisabledAction(env, j_local_session,
125 static_cast<int>(action));
126 }
127
106 void MediaSessionAndroid::Resume( 128 void MediaSessionAndroid::Resume(
107 JNIEnv* env, 129 JNIEnv* env,
108 const base::android::JavaParamRef<jobject>& j_obj) { 130 const base::android::JavaParamRef<jobject>& j_obj) {
109 DCHECK(media_session()); 131 DCHECK(media_session());
110 media_session()->Resume(MediaSession::SuspendType::UI); 132 media_session()->Resume(MediaSession::SuspendType::UI);
111 } 133 }
112 134
113 void MediaSessionAndroid::Suspend( 135 void MediaSessionAndroid::Suspend(
114 JNIEnv* env, 136 JNIEnv* env,
115 const base::android::JavaParamRef<jobject>& j_obj) { 137 const base::android::JavaParamRef<jobject>& j_obj) {
116 DCHECK(media_session()); 138 DCHECK(media_session());
117 media_session()->Suspend(MediaSession::SuspendType::UI); 139 media_session()->Suspend(MediaSession::SuspendType::UI);
118 } 140 }
119 141
120 void MediaSessionAndroid::Stop( 142 void MediaSessionAndroid::Stop(
121 JNIEnv* env, 143 JNIEnv* env,
122 const base::android::JavaParamRef<jobject>& j_obj) { 144 const base::android::JavaParamRef<jobject>& j_obj) {
123 DCHECK(media_session()); 145 DCHECK(media_session());
124 media_session()->Stop(MediaSession::SuspendType::UI); 146 media_session()->Stop(MediaSession::SuspendType::UI);
125 } 147 }
126 148
149 void MediaSessionAndroid::DidReceiveAction(JNIEnv* env,
150 const JavaParamRef<jobject>& obj,
151 int action) {
152 media_session()->DidReceiveAction(
153 static_cast<blink::mojom::MediaSessionAction>(action));
154 }
155
127 WebContentsAndroid* MediaSessionAndroid::GetWebContentsAndroid() { 156 WebContentsAndroid* MediaSessionAndroid::GetWebContentsAndroid() {
128 MediaSessionImpl* session = static_cast<MediaSessionImpl*>(media_session()); 157 MediaSessionImpl* session = static_cast<MediaSessionImpl*>(media_session());
129 if (!session) 158 if (!session)
130 return nullptr; 159 return nullptr;
131 WebContentsImpl* contents = 160 WebContentsImpl* contents =
132 static_cast<WebContentsImpl*>(session->web_contents()); 161 static_cast<WebContentsImpl*>(session->web_contents());
133 if (!contents) 162 if (!contents)
134 return nullptr; 163 return nullptr;
135 return contents->GetWebContentsAndroid(); 164 return contents->GetWebContentsAndroid();
136 } 165 }
137 166
138 ScopedJavaLocalRef<jobject> MediaSessionAndroid::GetJavaObject() { 167 ScopedJavaLocalRef<jobject> MediaSessionAndroid::GetJavaObject() {
139 JNIEnv* env = base::android::AttachCurrentThread(); 168 JNIEnv* env = base::android::AttachCurrentThread();
140 return j_media_session_.get(env); 169 return j_media_session_.get(env);
141 } 170 }
142 171
143 } // namespace content 172 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/session/media_session_android.h ('k') | content/browser/media/session/media_session_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698