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

Unified Diff: blimp/client/app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java

Issue 2292343002: Hooking up Blimp IME with BlimpContents (Closed)
Patch Set: Fixed linux client Created 4 years, 3 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: blimp/client/app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java
diff --git a/blimp/client/app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java b/blimp/client/app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java
index d719956d2934eace07991bd1835b097b4bbec37a..7579a04572db3067da3df248680f1c82ef7147d6 100644
--- a/blimp/client/app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java
+++ b/blimp/client/app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java
@@ -8,6 +8,7 @@ import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.blimp.R;
import org.chromium.blimp_public.session.AssignmentRequestResult;
+import org.chromium.ui.base.WindowAndroid;
import java.util.ArrayList;
import java.util.List;
@@ -61,10 +62,11 @@ public class BlimpClientSession {
private final List<ConnectionObserver> mObservers;
private long mNativeBlimpClientSessionAndroidPtr;
- public BlimpClientSession(String assignerUrl) {
+ public BlimpClientSession(String assignerUrl, WindowAndroid windowAndroid) {
mAssignerUrl = assignerUrl;
mObservers = new ArrayList<ConnectionObserver>();
- mNativeBlimpClientSessionAndroidPtr = nativeInit(mAssignerUrl);
+ mNativeBlimpClientSessionAndroidPtr =
+ nativeInit(mAssignerUrl, windowAndroid.getNativePointer());
}
/**
@@ -178,7 +180,7 @@ public class BlimpClientSession {
return nativeGetDebugInfo(mNativeBlimpClientSessionAndroidPtr);
}
- private native long nativeInit(String assignerUrl);
+ private native long nativeInit(String assignerUrl, long windowAndroidPtr);
private native void nativeConnect(long nativeBlimpClientSessionAndroid, String token);
private native void nativeDestroy(long nativeBlimpClientSessionAndroid);
private native int[] nativeGetDebugInfo(long nativeBlimpClientSessionAndroid);

Powered by Google App Engine
This is Rietveld 408576698