content/browser/android/content_view_core_impl.h - Issue 10911012: Upstream Android IME support (ImeAdapter).

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: content/browser/android/content_view_core_impl.h

Issue 10911012: Upstream Android IME support (ImeAdapter). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: nits fixed; recent downstream changes applied; ime adapter added to browser_jni_registrar Created 8 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:

Index: content/browser/android/content_view_core_impl.h

diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h

index 94c3f60ef0ae14292c8105e129574845c507d66d..f8525ff7057f047a4a0f71c8a8d38194ac757f73 100644

--- a/content/browser/android/content_view_core_impl.h

+++ b/content/browser/android/content_view_core_impl.h

@@ -113,6 +113,7 @@ class ContentViewCoreImpl : public ContentViewCore,

void ClearHistory(JNIEnv* env, jobject obj);

void SetClient(JNIEnv* env, jobject obj, jobject jclient);

jint EvaluateJavaScript(JNIEnv* env, jobject obj, jstring script);

+ virtual int GetNativeImeAdapter(JNIEnv* env, jobject obj) OVERRIDE;

virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() OVERRIDE;

void AddJavascriptInterface(JNIEnv* env,

jobject obj,

@@ -135,6 +136,11 @@ class ContentViewCoreImpl : public ContentViewCore,

bool multiple);

void OnTabCrashed(const base::ProcessHandle handle);

+ void ImeUpdateAdapter(int native_ime_adapter, int text_input_type,

+ const std::string& text,

+ int selection_start, int selection_end,

+ int composition_start, int composition_end,

+ bool show_ime_if_needed);

void SetTitle(const string16& title);

bool HasFocus();