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

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.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:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_android.h
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index 733d2fb3d0095e4cfc46188e2a6ed0af136ef940..df35da77d90224fbc91114a31def4900e4bf02a0 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -8,6 +8,7 @@
#include "base/compiler_specific.h"
#include "base/i18n/rtl.h"
#include "base/process.h"
+#include "content/browser/renderer_host/ime_adapter_android.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "ui/gfx/size.h"
@@ -104,9 +105,12 @@ class RenderWidgetHostViewAndroid : public RenderWidgetHostViewBase {
void SetContentViewCore(ContentViewCoreImpl* content_view_core);
+ void SendKeyEvent(const NativeWebKeyboardEvent& event);
void TouchEvent(const WebKit::WebTouchEvent& event);
void GestureEvent(const WebKit::WebGestureEvent& event);
+ int GetNativeImeAdapter();
+
private:
// The model object.
RenderWidgetHostImpl* host_;
@@ -121,6 +125,8 @@ class RenderWidgetHostViewAndroid : public RenderWidgetHostViewBase {
// variable because resizing is async.
gfx::Size requested_size_;
+ ImeAdapterAndroid ime_adapter_android_;
+
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
};
« no previous file with comments | « content/browser/renderer_host/ime_adapter_android.cc ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698