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

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

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 #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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 if (!Java_MediaSessionImpl_hasObservers(env, j_local_session)) 103 if (!Java_MediaSessionImpl_hasObservers(env, j_local_session))
104 return; 104 return;
105 105
106 ScopedJavaLocalRef<jobject> j_metadata; 106 ScopedJavaLocalRef<jobject> j_metadata;
107 if (metadata.has_value()) 107 if (metadata.has_value())
108 j_metadata = MediaMetadataAndroid::CreateJavaObject(env, metadata.value()); 108 j_metadata = MediaMetadataAndroid::CreateJavaObject(env, metadata.value());
109 Java_MediaSessionImpl_mediaSessionMetadataChanged(env, j_local_session, 109 Java_MediaSessionImpl_mediaSessionMetadataChanged(env, j_local_session,
110 j_metadata); 110 j_metadata);
111 } 111 }
112 112
113 void MediaSessionAndroid::MediaSessionEnabledAction(
114 blink::mojom::MediaSessionAction action) {
115 ScopedJavaLocalRef<jobject> j_local_session = GetJavaObject();
116 if (j_local_session.is_null())
117 return;
118
119 JNIEnv* env = base::android::AttachCurrentThread();
120 Java_MediaSessionImpl_mediaSessionEnabledAction(env, j_local_session,
121 static_cast<int>(action));
122 }
123
124 void MediaSessionAndroid::MediaSessionDisabledAction(
125 blink::mojom::MediaSessionAction action) {
126 ScopedJavaLocalRef<jobject> j_local_session = GetJavaObject();
127 if (j_local_session.is_null())
128 return;
129
130 JNIEnv* env = base::android::AttachCurrentThread();
131 Java_MediaSessionImpl_mediaSessionDisabledAction(env, j_local_session,
132 static_cast<int>(action));
133 }
134
135 void MediaSessionAndroid::Resume( 113 void MediaSessionAndroid::Resume(
136 JNIEnv* env, 114 JNIEnv* env,
137 const base::android::JavaParamRef<jobject>& j_obj) { 115 const base::android::JavaParamRef<jobject>& j_obj) {
138 DCHECK(media_session()); 116 DCHECK(media_session());
139 media_session()->Resume(MediaSession::SuspendType::UI); 117 media_session()->Resume(MediaSession::SuspendType::UI);
140 } 118 }
141 119
142 void MediaSessionAndroid::Suspend( 120 void MediaSessionAndroid::Suspend(
143 JNIEnv* env, 121 JNIEnv* env,
144 const base::android::JavaParamRef<jobject>& j_obj) { 122 const base::android::JavaParamRef<jobject>& j_obj) {
145 DCHECK(media_session()); 123 DCHECK(media_session());
146 media_session()->Suspend(MediaSession::SuspendType::UI); 124 media_session()->Suspend(MediaSession::SuspendType::UI);
147 } 125 }
148 126
149 void MediaSessionAndroid::Stop( 127 void MediaSessionAndroid::Stop(
150 JNIEnv* env, 128 JNIEnv* env,
151 const base::android::JavaParamRef<jobject>& j_obj) { 129 const base::android::JavaParamRef<jobject>& j_obj) {
152 DCHECK(media_session()); 130 DCHECK(media_session());
153 media_session()->Stop(MediaSession::SuspendType::UI); 131 media_session()->Stop(MediaSession::SuspendType::UI);
154 } 132 }
155 133
156 void MediaSessionAndroid::DidReceiveAction(JNIEnv* env,
157 const JavaParamRef<jobject>& obj,
158 int action) {
159 media_session()->DidReceiveAction(
160 static_cast<blink::mojom::MediaSessionAction>(action));
161 }
162
163 WebContentsAndroid* MediaSessionAndroid::GetWebContentsAndroid() { 134 WebContentsAndroid* MediaSessionAndroid::GetWebContentsAndroid() {
164 MediaSessionImpl* session = static_cast<MediaSessionImpl*>(media_session()); 135 MediaSessionImpl* session = static_cast<MediaSessionImpl*>(media_session());
165 if (!session) 136 if (!session)
166 return nullptr; 137 return nullptr;
167 WebContentsImpl* contents = 138 WebContentsImpl* contents =
168 static_cast<WebContentsImpl*>(session->web_contents()); 139 static_cast<WebContentsImpl*>(session->web_contents());
169 if (!contents) 140 if (!contents)
170 return nullptr; 141 return nullptr;
171 return contents->GetWebContentsAndroid(); 142 return contents->GetWebContentsAndroid();
172 } 143 }
173 144
174 ScopedJavaLocalRef<jobject> MediaSessionAndroid::GetJavaObject() { 145 ScopedJavaLocalRef<jobject> MediaSessionAndroid::GetJavaObject() {
175 JNIEnv* env = base::android::AttachCurrentThread(); 146 JNIEnv* env = base::android::AttachCurrentThread();
176 return j_media_session_.get(env); 147 return j_media_session_.get(env);
177 } 148 }
178 149
179 } // namespace content 150 } // 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