diff options
| author | jdduke <jdduke@chromium.org> | 2014-12-19 12:35:29 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-19 20:37:04 +0000 |
| commit | 8ce475eea02919bb638c969232b755de99800315 (patch) | |
| tree | cdf3209c9280280464ce8f368dfba5b219ed9c4f /content/browser/renderer_host/ime_adapter_android.cc | |
| parent | 24c1e1269a4e95ee0319f0044cb5a9730bb8729f (diff) | |
| download | chromium_src-8ce475eea02919bb638c969232b755de99800315.zip chromium_src-8ce475eea02919bb638c969232b755de99800315.tar.gz chromium_src-8ce475eea02919bb638c969232b755de99800315.tar.bz2 | |
[Android] Use the TextInputType enum in ImeAdapater
Use the auto-generated TextInputType Java enum class directly, rather
than the static constants previously piped to ImeAdapater.
Review URL: https://codereview.chromium.org/818493004
Cr-Commit-Position: refs/heads/master@{#309247}
Diffstat (limited to 'content/browser/renderer_host/ime_adapter_android.cc')
| -rw-r--r-- | content/browser/renderer_host/ime_adapter_android.cc | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/content/browser/renderer_host/ime_adapter_android.cc b/content/browser/renderer_host/ime_adapter_android.cc index 077e625..d780d0c 100644 --- a/content/browser/renderer_host/ime_adapter_android.cc +++ b/content/browser/renderer_host/ime_adapter_android.cc @@ -57,6 +57,8 @@ NativeWebKeyboardEvent NativeWebKeyboardEventFromKeyEvent( type = blink::WebInputEvent::RawKeyDown; else if (action == AKEY_EVENT_ACTION_UP) type = blink::WebInputEvent::KeyUp; + else + NOTREACHED() << "Invalid Android key event action: " << action; return NativeWebKeyboardEvent(java_key_event, type, modifiers, time_ms / 1000.0, key_code, unicode_char, is_system_key); } @@ -76,18 +78,6 @@ bool RegisterImeAdapter(JNIEnv* env) { blink::WebInputEvent::ControlKey, blink::WebInputEvent::CapsLockOn, blink::WebInputEvent::NumLockOn); - Java_ImeAdapter_initializeTextInputTypes( - env, - ui::TEXT_INPUT_TYPE_NONE, - ui::TEXT_INPUT_TYPE_TEXT, - ui::TEXT_INPUT_TYPE_TEXT_AREA, - ui::TEXT_INPUT_TYPE_PASSWORD, - ui::TEXT_INPUT_TYPE_SEARCH, - ui::TEXT_INPUT_TYPE_URL, - ui::TEXT_INPUT_TYPE_EMAIL, - ui::TEXT_INPUT_TYPE_TELEPHONE, - ui::TEXT_INPUT_TYPE_NUMBER, - ui::TEXT_INPUT_TYPE_CONTENT_EDITABLE); Java_ImeAdapter_initializeTextInputFlags( env, blink::WebTextInputFlagAutocompleteOn, @@ -107,8 +97,8 @@ void AppendBackgroundColorSpan(JNIEnv*, jint start, jint end, jint background_color) { - DCHECK(start >= 0); - DCHECK(end >= 0); + DCHECK_GE(start, 0); + DCHECK_GE(end, 0); // Do not check |background_color|. std::vector<blink::WebCompositionUnderline>* underlines = reinterpret_cast<std::vector<blink::WebCompositionUnderline>*>( @@ -128,8 +118,8 @@ void AppendUnderlineSpan(JNIEnv*, jlong underlines_ptr, jint start, jint end) { - DCHECK(start >= 0); - DCHECK(end >= 0); + DCHECK_GE(start, 0); + DCHECK_GE(end, 0); std::vector<blink::WebCompositionUnderline>* underlines = reinterpret_cast<std::vector<blink::WebCompositionUnderline>*>( underlines_ptr); |