blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java - Issue 2270323004: Add BlimpView to a Chrome tab when Blimp is enabled.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java

Issue 2270323004: Add BlimpView to a Chrome tab when Blimp is enabled. (Closed)

Patch Set: addressed nit, renamed CreateForTesting and piped through touch handling Created 4 years, 4 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

« no previous file with comments | « blimp/client/core/android/blimp_client_context_impl_android.cc ('k') | blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java

diff --git a/blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java b/blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java

index c34cf66a99f4ec3b682c3e6a022cc32a9d0778e1..9281288f3bfeb51fb08bae8a568c13a221103061 100644

--- a/blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java

+++ b/blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java

@@ -15,6 +15,7 @@ import org.chromium.blimp.core.settings.PreferencesUtil;

import org.chromium.blimp_public.BlimpClientContext;

import org.chromium.blimp_public.BlimpClientContextDelegate;

import org.chromium.blimp_public.contents.BlimpContents;

+import org.chromium.ui.base.WindowAndroid;

/**

* BlimpClientContextImpl is a Java wrapper to allow communicating with the native

@@ -57,9 +58,10 @@ public class BlimpClientContextImpl implements BlimpClientContext, BlimpPreferen

}

@Override

- public BlimpContents createBlimpContents() {

+ public BlimpContents createBlimpContents(WindowAndroid windowAndroid) {

assert mNativeBlimpClientContextImplAndroid != 0;

- return nativeCreateBlimpContentsJava(mNativeBlimpClientContextImplAndroid);

+ return nativeCreateBlimpContentsJava(

+ mNativeBlimpClientContextImplAndroid, windowAndroid.getNativePointer());

}

@Override

@@ -106,7 +108,7 @@ public class BlimpClientContextImpl implements BlimpClientContext, BlimpPreferen

}

private native BlimpContents nativeCreateBlimpContentsJava(

- long nativeBlimpClientContextImplAndroid);

+ long nativeBlimpClientContextImplAndroid, long windowAndroidPtr);

private native void nativeConnectFromJava(long nativeBlimpClientContextImplAndroid);

private native void nativeInitSettingsPage(