Chromium Code Reviews| OLD | NEW |
|---|---|
| 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" |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 269 } | 269 } |
| 270 | 270 |
| 271 void RemoteMediaPlayerBridge::RequestRemotePlaybackControl() { | 271 void RemoteMediaPlayerBridge::RequestRemotePlaybackControl() { |
| 272 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 272 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 273 JNIEnv* env = AttachCurrentThread(); | 273 JNIEnv* env = AttachCurrentThread(); |
| 274 CHECK(env); | 274 CHECK(env); |
| 275 | 275 |
| 276 Java_RemoteMediaPlayerBridge_requestRemotePlaybackControl(env, java_bridge_); | 276 Java_RemoteMediaPlayerBridge_requestRemotePlaybackControl(env, java_bridge_); |
| 277 } | 277 } |
| 278 | 278 |
| 279 void RemoteMediaPlayerBridge::RequestRemotePlaybackStop() { | |
| 280 DCHECK_CURRENTLY_ON(BrowserThread::UI); | |
| 281 JNIEnv* env = AttachCurrentThread(); | |
| 282 CHECK(env); | |
|
dcheng
2016/11/04 01:51:44
Please don't use CHECK for this: https://chromium.
whywhat
2016/11/04 15:01:06
Done. Seems like everyone else is using DCHECK(env
| |
| 283 | |
| 284 Java_RemoteMediaPlayerBridge_requestRemotePlaybackStop(env, java_bridge_); | |
| 285 } | |
| 286 | |
| 279 void RemoteMediaPlayerBridge::SetNativePlayer() { | 287 void RemoteMediaPlayerBridge::SetNativePlayer() { |
| 280 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 288 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 281 JNIEnv* env = AttachCurrentThread(); | 289 JNIEnv* env = AttachCurrentThread(); |
| 282 CHECK(env); | 290 CHECK(env); |
| 283 | 291 |
| 284 Java_RemoteMediaPlayerBridge_setNativePlayer(env, java_bridge_); | 292 Java_RemoteMediaPlayerBridge_setNativePlayer(env, java_bridge_); |
| 285 } | 293 } |
| 286 | 294 |
| 287 void RemoteMediaPlayerBridge::OnPlayerCreated() { | 295 void RemoteMediaPlayerBridge::OnPlayerCreated() { |
| 288 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 296 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 472 Java_RemoteMediaPlayerBridge_setCookies( | 480 Java_RemoteMediaPlayerBridge_setCookies( |
| 473 env, java_bridge_, ConvertUTF8ToJavaString(env, cookies)); | 481 env, java_bridge_, ConvertUTF8ToJavaString(env, cookies)); |
| 474 } | 482 } |
| 475 | 483 |
| 476 MediaPlayerAndroid* RemoteMediaPlayerBridge::GetLocalPlayer() { | 484 MediaPlayerAndroid* RemoteMediaPlayerBridge::GetLocalPlayer() { |
| 477 return static_cast<RemoteMediaPlayerManager*>(manager())->GetLocalPlayer( | 485 return static_cast<RemoteMediaPlayerManager*>(manager())->GetLocalPlayer( |
| 478 player_id()); | 486 player_id()); |
| 479 } | 487 } |
| 480 | 488 |
| 481 } // namespace remote_media | 489 } // namespace remote_media |
| OLD | NEW |