| OLD | NEW |
| 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 #include "content/browser/renderer_host/ime_adapter_android.h" | 5 #include "content/browser/renderer_host/ime_adapter_android.h" |
| 6 | 6 |
| 7 #include <android/input.h> | 7 #include <android/input.h> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
| 11 #include "base/android/scoped_java_ref.h" | 11 #include "base/android/scoped_java_ref.h" |
| 12 #include "base/time.h" | 12 #include "base/time.h" |
| 13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
| 14 #include "content/browser/renderer_host/render_widget_host_impl.h" | 14 #include "content/browser/renderer_host/render_widget_host_impl.h" |
| 15 #include "content/browser/renderer_host/render_widget_host_view_android.h" | 15 #include "content/browser/renderer_host/render_widget_host_view_android.h" |
| 16 #include "content/common/view_input_messages.h" |
| 16 #include "content/common/view_messages.h" | 17 #include "content/common/view_messages.h" |
| 17 #include "content/public/browser/native_web_keyboard_event.h" | 18 #include "content/public/browser/native_web_keyboard_event.h" |
| 18 #include "jni/ImeAdapter_jni.h" | 19 #include "jni/ImeAdapter_jni.h" |
| 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderli
ne.h" | 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderli
ne.h" |
| 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
| 21 | 22 |
| 22 using base::android::AttachCurrentThread; | 23 using base::android::AttachCurrentThread; |
| 23 using base::android::ConvertJavaStringToUTF16; | 24 using base::android::ConvertJavaStringToUTF16; |
| 24 | 25 |
| 25 namespace content { | 26 namespace content { |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 rwhi->Send(new ViewMsg_ExtendSelectionAndDelete(rwhi->GetRoutingID(), | 221 rwhi->Send(new ViewMsg_ExtendSelectionAndDelete(rwhi->GetRoutingID(), |
| 221 before, after)); | 222 before, after)); |
| 222 } | 223 } |
| 223 | 224 |
| 224 void ImeAdapterAndroid::Unselect(JNIEnv* env, jobject) { | 225 void ImeAdapterAndroid::Unselect(JNIEnv* env, jobject) { |
| 225 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( | 226 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( |
| 226 rwhva_->GetRenderWidgetHost()); | 227 rwhva_->GetRenderWidgetHost()); |
| 227 if (!rwhi) | 228 if (!rwhi) |
| 228 return; | 229 return; |
| 229 | 230 |
| 230 rwhi->Send(new ViewMsg_Unselect(rwhi->GetRoutingID())); | 231 rwhi->Send(new ViewInputMsg_Unselect(rwhi->GetRoutingID())); |
| 231 } | 232 } |
| 232 | 233 |
| 233 void ImeAdapterAndroid::SelectAll(JNIEnv* env, jobject) { | 234 void ImeAdapterAndroid::SelectAll(JNIEnv* env, jobject) { |
| 234 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( | 235 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( |
| 235 rwhva_->GetRenderWidgetHost()); | 236 rwhva_->GetRenderWidgetHost()); |
| 236 if (!rwhi) | 237 if (!rwhi) |
| 237 return; | 238 return; |
| 238 | 239 |
| 239 rwhi->Send(new ViewMsg_SelectAll(rwhi->GetRoutingID())); | 240 rwhi->Send(new ViewInputMsg_SelectAll(rwhi->GetRoutingID())); |
| 240 } | 241 } |
| 241 | 242 |
| 242 void ImeAdapterAndroid::Cut(JNIEnv* env, jobject) { | 243 void ImeAdapterAndroid::Cut(JNIEnv* env, jobject) { |
| 243 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( | 244 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( |
| 244 rwhva_->GetRenderWidgetHost()); | 245 rwhva_->GetRenderWidgetHost()); |
| 245 if (!rwhi) | 246 if (!rwhi) |
| 246 return; | 247 return; |
| 247 | 248 |
| 248 rwhi->Send(new ViewMsg_Cut(rwhi->GetRoutingID())); | 249 rwhi->Send(new ViewInputMsg_Cut(rwhi->GetRoutingID())); |
| 249 } | 250 } |
| 250 | 251 |
| 251 void ImeAdapterAndroid::Copy(JNIEnv* env, jobject) { | 252 void ImeAdapterAndroid::Copy(JNIEnv* env, jobject) { |
| 252 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( | 253 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( |
| 253 rwhva_->GetRenderWidgetHost()); | 254 rwhva_->GetRenderWidgetHost()); |
| 254 if (!rwhi) | 255 if (!rwhi) |
| 255 return; | 256 return; |
| 256 | 257 |
| 257 rwhi->Send(new ViewMsg_Copy(rwhi->GetRoutingID())); | 258 rwhi->Send(new ViewInputMsg_Copy(rwhi->GetRoutingID())); |
| 258 } | 259 } |
| 259 | 260 |
| 260 void ImeAdapterAndroid::Paste(JNIEnv* env, jobject) { | 261 void ImeAdapterAndroid::Paste(JNIEnv* env, jobject) { |
| 261 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( | 262 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( |
| 262 rwhva_->GetRenderWidgetHost()); | 263 rwhva_->GetRenderWidgetHost()); |
| 263 if (!rwhi) | 264 if (!rwhi) |
| 264 return; | 265 return; |
| 265 | 266 |
| 266 rwhi->Send(new ViewMsg_Paste(rwhi->GetRoutingID())); | 267 rwhi->Send(new ViewInputMsg_Paste(rwhi->GetRoutingID())); |
| 267 } | 268 } |
| 268 | 269 |
| 269 void ImeAdapterAndroid::ResetImeAdapter(JNIEnv* env, jobject) { | 270 void ImeAdapterAndroid::ResetImeAdapter(JNIEnv* env, jobject) { |
| 270 java_ime_adapter_.reset(); | 271 java_ime_adapter_.reset(); |
| 271 } | 272 } |
| 272 | 273 |
| 273 } // namespace content | 274 } // namespace content |
| OLD | NEW |