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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java

Issue 1580733002: [Android cast] Make the local player exit seeking mode on cast start (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename a function to avoid tripping the clang checker Created 4 years, 11 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java
index 4c2f07404834a81eeba53a61d5036e8ab63c1b7c..280f686478b70afb89eb263f34851617217e3002 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java
@@ -9,9 +9,9 @@
import android.graphics.Bitmap;
import android.media.MediaPlayer;
import android.os.Build;
-import android.util.Log;
import org.chromium.base.CommandLine;
+import org.chromium.base.Log;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.chrome.browser.ChromeSwitches;
@@ -30,6 +30,8 @@
private final long mStartPositionMillis;
private long mNativeRemoteMediaPlayerBridge;
+ // TODO(dgn) We don't create MediaPlayerListener using a RemoteMediaPlayerBridge anymore so
+ // the inheritance and the extra listeners can now go away. (https://crbug.com/577110)
private MediaPlayer.OnCompletionListener mOnCompletionListener;
private MediaPlayer.OnSeekCompleteListener mOnSeekCompleteListener;
private MediaPlayer.OnErrorListener mOnErrorListener;
@@ -73,8 +75,8 @@ public void onError() {
@Override
public void onSeekCompleted() {
- if (mActive && mOnSeekCompleteListener != null) {
- mOnSeekCompleteListener.onSeekComplete(null);
+ if (mActive && mNativeRemoteMediaPlayerBridge != 0) {
+ nativeOnSeekCompleted(mNativeRemoteMediaPlayerBridge);
}
}
@@ -383,4 +385,5 @@ private native void nativeOnRouteAvailabilityChanged(long nativeRemoteMediaPlaye
private native void nativeOnCastStarting(long nativeRemoteMediaPlayerBridge,
String castingMessage);
private native void nativeOnCastStopping(long nativeRemoteMediaPlayerBridge);
+ private native void nativeOnSeekCompleted(long nativeRemoteMediaPlayerBridge);
}

Powered by Google App Engine
This is Rietveld 408576698