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

Side by Side Diff: content/browser/renderer_host/ime_adapter_android.h

Issue 784503002: Revert "Plumb composition character bounds from C++ to Java" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « no previous file | content/browser/renderer_host/ime_adapter_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_IME_ADAPTER_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_IME_ADAPTER_ANDROID_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_IME_ADAPTER_ANDROID_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_IME_ADAPTER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include <vector>
11
12 #include "base/android/jni_weak_ref.h" 10 #include "base/android/jni_weak_ref.h"
13 #include "ui/gfx/geometry/rect.h"
14 11
15 namespace content { 12 namespace content {
16 13
17 class RenderFrameHost; 14 class RenderFrameHost;
18 class RenderWidgetHostImpl; 15 class RenderWidgetHostImpl;
19 class RenderWidgetHostViewAndroid; 16 class RenderWidgetHostViewAndroid;
20 class WebContents; 17 class WebContents;
21 struct NativeWebKeyboardEvent; 18 struct NativeWebKeyboardEvent;
22 19
23 // This class is in charge of dispatching key events from the java side 20 // This class is in charge of dispatching key events from the java side
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 void Unselect(JNIEnv*, jobject); 57 void Unselect(JNIEnv*, jobject);
61 void SelectAll(JNIEnv*, jobject); 58 void SelectAll(JNIEnv*, jobject);
62 void Cut(JNIEnv*, jobject); 59 void Cut(JNIEnv*, jobject);
63 void Copy(JNIEnv*, jobject); 60 void Copy(JNIEnv*, jobject);
64 void Paste(JNIEnv*, jobject); 61 void Paste(JNIEnv*, jobject);
65 void ResetImeAdapter(JNIEnv*, jobject); 62 void ResetImeAdapter(JNIEnv*, jobject);
66 63
67 // Called from native -> java 64 // Called from native -> java
68 void CancelComposition(); 65 void CancelComposition();
69 void FocusedNodeChanged(bool is_editable_node); 66 void FocusedNodeChanged(bool is_editable_node);
70 void SetCharacterBounds(const std::vector<gfx::Rect>& rects);
71 67
72 private: 68 private:
73 RenderWidgetHostImpl* GetRenderWidgetHostImpl(); 69 RenderWidgetHostImpl* GetRenderWidgetHostImpl();
74 RenderFrameHost* GetFocusedFrame(); 70 RenderFrameHost* GetFocusedFrame();
75 WebContents* GetWebContents(); 71 WebContents* GetWebContents();
76 72
77 RenderWidgetHostViewAndroid* rwhva_; 73 RenderWidgetHostViewAndroid* rwhva_;
78 JavaObjectWeakGlobalRef java_ime_adapter_; 74 JavaObjectWeakGlobalRef java_ime_adapter_;
79 }; 75 };
80 76
81 bool RegisterImeAdapter(JNIEnv* env); 77 bool RegisterImeAdapter(JNIEnv* env);
82 78
83 } // namespace content 79 } // namespace content
84 80
85 #endif // CONTENT_BROWSER_RENDERER_HOST_IME_ADAPTER_ANDROID_H_ 81 #endif // CONTENT_BROWSER_RENDERER_HOST_IME_ADAPTER_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/ime_adapter_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698