| Index: content/browser/renderer_host/ime_adapter_android.cc
|
| diff --git a/content/browser/renderer_host/ime_adapter_android.cc b/content/browser/renderer_host/ime_adapter_android.cc
|
| index 3cae5ec00d87c0eb10b9687cdb3cc3003c7affe4..61731a7c0a7ee24faa75a36af8ad43aa2c23c104 100644
|
| --- a/content/browser/renderer_host/ime_adapter_android.cc
|
| +++ b/content/browser/renderer_host/ime_adapter_android.cc
|
| @@ -63,6 +63,11 @@ bool RegisterImeAdapter(JNIEnv* env) {
|
| WebKit::WebInputEvent::ControlKey,
|
| WebKit::WebInputEvent::CapsLockOn,
|
| WebKit::WebInputEvent::NumLockOn);
|
| + // TODO(miguelg) note that WebKit is removing the date time related
|
| + // input elements from the enum since they are no longer considered
|
| + // to be textual input ields. As the entry point is now different we can
|
| + // actually tell the IME adapter if it's a dialog type without having
|
| + // to reply on the enum values for that.
|
| Java_ImeAdapter_initializeTextInputTypes(
|
| env,
|
| ui::TEXT_INPUT_TYPE_NONE,
|
| @@ -170,23 +175,24 @@ void ImeAdapterAndroid::CancelComposition() {
|
| Java_ImeAdapter_cancelComposition(AttachCurrentThread(), java_ime_adapter_);
|
| }
|
|
|
| -void ImeAdapterAndroid::ReplaceText(JNIEnv* env, jobject, jstring text) {
|
| +void ImeAdapterAndroid::ReplaceDateTime(JNIEnv* env, jobject, jstring text) {
|
| RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(
|
| rwhva_->GetRenderWidgetHost());
|
| if (!rwhi)
|
| return;
|
|
|
| string16 text16 = ConvertJavaStringToUTF16(env, text);
|
| - rwhi->Send(new ViewMsg_ReplaceAll(rwhi->GetRoutingID(), text16));
|
| + rwhi->Send(new ViewMsg_ReplaceDateTime(rwhi->GetRoutingID(), text16));
|
| }
|
|
|
| -void ImeAdapterAndroid::ClearFocus(JNIEnv* env, jobject) {
|
| +
|
| +void ImeAdapterAndroid::CancelDialog(JNIEnv* env, jobject) {
|
| RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(
|
| rwhva_->GetRenderWidgetHost());
|
| if (!rwhi)
|
| return;
|
|
|
| - rwhi->Send(new ViewMsg_ClearFocusedNode(rwhi->GetRoutingID()));
|
| + rwhi->Send(new ViewMsg_CancelDateTimeDialog(rwhi->GetRoutingID()));
|
| }
|
|
|
| void ImeAdapterAndroid::SetEditableSelectionOffsets(JNIEnv*, jobject,
|
|
|