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

Side by Side 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, 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/process.h" 10 #include "base/process.h"
11 #include "content/browser/renderer_host/ime_adapter_android.h"
11 #include "content/browser/renderer_host/render_widget_host_view_base.h" 12 #include "content/browser/renderer_host/render_widget_host_view_base.h"
12 #include "ui/gfx/size.h" 13 #include "ui/gfx/size.h"
13 14
14 struct ViewHostMsg_TextInputState_Params; 15 struct ViewHostMsg_TextInputState_Params;
15 16
16 struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params; 17 struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
17 struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params; 18 struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params;
18 19
19 namespace content { 20 namespace content {
20 class ContentViewCoreImpl; 21 class ContentViewCoreImpl;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 bool has_horizontal_scrollbar) OVERRIDE; 98 bool has_horizontal_scrollbar) OVERRIDE;
98 virtual void SetScrollOffsetPinning( 99 virtual void SetScrollOffsetPinning(
99 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; 100 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
100 virtual bool LockMouse() OVERRIDE; 101 virtual bool LockMouse() OVERRIDE;
101 virtual void UnlockMouse() OVERRIDE; 102 virtual void UnlockMouse() OVERRIDE;
102 virtual void StartContentIntent(const GURL& content_url) OVERRIDE; 103 virtual void StartContentIntent(const GURL& content_url) OVERRIDE;
103 virtual void DidSetNeedTouchEvents(bool need_touch_events) OVERRIDE; 104 virtual void DidSetNeedTouchEvents(bool need_touch_events) OVERRIDE;
104 105
105 void SetContentViewCore(ContentViewCoreImpl* content_view_core); 106 void SetContentViewCore(ContentViewCoreImpl* content_view_core);
106 107
108 void SendKeyEvent(const NativeWebKeyboardEvent& event);
107 void TouchEvent(const WebKit::WebTouchEvent& event); 109 void TouchEvent(const WebKit::WebTouchEvent& event);
108 void GestureEvent(const WebKit::WebGestureEvent& event); 110 void GestureEvent(const WebKit::WebGestureEvent& event);
109 111
112 int GetNativeImeAdapter();
113
110 private: 114 private:
111 // The model object. 115 // The model object.
112 RenderWidgetHostImpl* host_; 116 RenderWidgetHostImpl* host_;
113 117
114 // Whether or not this widget is hidden. 118 // Whether or not this widget is hidden.
115 bool is_hidden_; 119 bool is_hidden_;
116 120
117 // ContentViewCoreImpl is our interface to the view system. 121 // ContentViewCoreImpl is our interface to the view system.
118 ContentViewCoreImpl* content_view_core_; 122 ContentViewCoreImpl* content_view_core_;
119 123
120 // The size that we want the renderer to be. We keep this in a separate 124 // The size that we want the renderer to be. We keep this in a separate
121 // variable because resizing is async. 125 // variable because resizing is async.
122 gfx::Size requested_size_; 126 gfx::Size requested_size_;
123 127
128 ImeAdapterAndroid ime_adapter_android_;
129
124 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); 130 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
125 }; 131 };
126 132
127 } // namespace content 133 } // namespace content
128 134
129 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 135 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
OLDNEW
« 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