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

Side by Side Diff: chrome/browser/media/android/remote/remote_media_player_bridge.cc

Issue 2480003002: [RemotePlayback] Keep track of source compatibility and reject prompt() correspondingly (Closed)
Patch Set: Fixed the java enum comment 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/media/android/remote/remote_media_player_bridge.h" 5 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
11 #include "chrome/browser/media/android/remote/record_cast_action.h" 11 #include "chrome/browser/media/android/remote/record_cast_action.h"
12 #include "chrome/browser/media/android/remote/remote_media_player_manager.h" 12 #include "chrome/browser/media/android/remote/remote_media_player_manager.h"
13 #include "content/public/browser/android/content_view_core.h" 13 #include "content/public/browser/android/content_view_core.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
16 #include "jni/RemoteMediaPlayerBridge_jni.h" 16 #include "jni/RemoteMediaPlayerBridge_jni.h"
17 #include "media/base/android/media_common_android.h" 17 #include "media/base/android/media_common_android.h"
18 #include "media/base/android/media_resource_getter.h" 18 #include "media/base/android/media_resource_getter.h"
19 #include "media/base/timestamp_constants.h" 19 #include "media/base/timestamp_constants.h"
20 #include "net/base/escape.h" 20 #include "net/base/escape.h"
21 #include "third_party/WebKit/public/platform/modules/remoteplayback/WebRemotePla ybackAvailability.h"
21 #include "third_party/skia/include/core/SkBitmap.h" 22 #include "third_party/skia/include/core/SkBitmap.h"
22 #include "ui/gfx/android/java_bitmap.h" 23 #include "ui/gfx/android/java_bitmap.h"
23 24
24 using base::android::ConvertUTF8ToJavaString; 25 using base::android::ConvertUTF8ToJavaString;
25 using base::android::ConvertJavaStringToUTF8; 26 using base::android::ConvertJavaStringToUTF8;
26 using base::android::JavaParamRef; 27 using base::android::JavaParamRef;
27 using base::android::ScopedJavaLocalRef; 28 using base::android::ScopedJavaLocalRef;
28 using base::android::AttachCurrentThread; 29 using base::android::AttachCurrentThread;
29 using content::BrowserThread; 30 using content::BrowserThread;
30 using media::MediaPlayerAndroid; 31 using media::MediaPlayerAndroid;
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 void RemoteMediaPlayerBridge::OnPlaybackFinished( 246 void RemoteMediaPlayerBridge::OnPlaybackFinished(
246 JNIEnv* env, 247 JNIEnv* env,
247 const JavaParamRef<jobject>& obj) { 248 const JavaParamRef<jobject>& obj) {
248 static_cast<RemoteMediaPlayerManager *>(manager())->OnRemotePlaybackFinished( 249 static_cast<RemoteMediaPlayerManager *>(manager())->OnRemotePlaybackFinished(
249 player_id()); 250 player_id());
250 } 251 }
251 252
252 void RemoteMediaPlayerBridge::OnRouteAvailabilityChanged( 253 void RemoteMediaPlayerBridge::OnRouteAvailabilityChanged(
253 JNIEnv* env, 254 JNIEnv* env,
254 const JavaParamRef<jobject>& obj, 255 const JavaParamRef<jobject>& obj,
255 jboolean available) { 256 int availability) {
256 static_cast<RemoteMediaPlayerManager *>(manager())-> 257 static_cast<RemoteMediaPlayerManager *>(manager())->
257 OnRouteAvailabilityChanged(player_id(), available); 258 OnRouteAvailabilityChanged(
259 player_id(),
260 static_cast<blink::WebRemotePlaybackAvailability>(availability));
258 } 261 }
259 262
260 // static 263 // static
261 bool RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge(JNIEnv* env) { 264 bool RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge(JNIEnv* env) {
262 bool ret = RegisterNativesImpl(env); 265 bool ret = RegisterNativesImpl(env);
263 DCHECK(g_RemoteMediaPlayerBridge_clazz); 266 DCHECK(g_RemoteMediaPlayerBridge_clazz);
264 return ret; 267 return ret;
265 } 268 }
266 269
267 void RemoteMediaPlayerBridge::RequestRemotePlayback() { 270 void RemoteMediaPlayerBridge::RequestRemotePlayback() {
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 Java_RemoteMediaPlayerBridge_setCookies( 491 Java_RemoteMediaPlayerBridge_setCookies(
489 env, java_bridge_, ConvertUTF8ToJavaString(env, cookies)); 492 env, java_bridge_, ConvertUTF8ToJavaString(env, cookies));
490 } 493 }
491 494
492 MediaPlayerAndroid* RemoteMediaPlayerBridge::GetLocalPlayer() { 495 MediaPlayerAndroid* RemoteMediaPlayerBridge::GetLocalPlayer() {
493 return static_cast<RemoteMediaPlayerManager*>(manager())->GetLocalPlayer( 496 return static_cast<RemoteMediaPlayerManager*>(manager())->GetLocalPlayer(
494 player_id()); 497 player_id());
495 } 498 }
496 499
497 } // namespace remote_media 500 } // namespace remote_media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698