Chromium Code Reviews| Index: blimp/client/app/android/ime_helper_dialog.cc |
| diff --git a/blimp/client/app/android/ime_helper_dialog.cc b/blimp/client/app/android/ime_helper_dialog.cc |
| index 698424789b6b109c6944a7759831dcc7f03bf995..b10dc65fbe4472fe3a19d38b9ac8143bca956395 100644 |
| --- a/blimp/client/app/android/ime_helper_dialog.cc |
| +++ b/blimp/client/app/android/ime_helper_dialog.cc |
| @@ -14,6 +14,7 @@ using base::android::JavaParamRef; |
| namespace blimp { |
| namespace client { |
| +namespace app { |
| static jlong Init(JNIEnv* env, |
| const JavaParamRef<jobject>& jobj, |
| @@ -47,8 +48,11 @@ void ImeHelperDialog::Destroy(JNIEnv* env, const JavaParamRef<jobject>& jobj) { |
| delete this; |
| } |
| -void ImeHelperDialog::OnShowImeRequested(ui::TextInputType input_type, |
| - const std::string& text) { |
| +void ImeHelperDialog::OnShowImeRequested( |
| + ui::TextInputType input_type, |
| + const std::string& text, |
| + const ImeFeature::ShowImeCallback& callback) { |
| + text_submit_callback_ = callback; |
| JNIEnv* env = base::android::AttachCurrentThread(); |
| DCHECK_NE(ui::TEXT_INPUT_TYPE_NONE, input_type); |
| Java_ImeHelperDialog_onShowImeRequested( |
| @@ -64,9 +68,11 @@ void ImeHelperDialog::OnHideImeRequested() { |
| void ImeHelperDialog::OnImeTextEntered(JNIEnv* env, |
| const JavaParamRef<jobject>& jobj, |
| const JavaParamRef<jstring>& text) { |
| - std::string textInput = base::android::ConvertJavaStringToUTF8(env, text); |
| - ime_feature_->OnImeTextEntered(textInput); |
| + std::string text_input = base::android::ConvertJavaStringToUTF8(env, text); |
| + text_submit_callback_.Run(text_input); |
|
David Trainor- moved to gerrit
2016/08/31 18:59:54
try
base::ResetAndReturn(&text_submit_callback_)
|
| + text_submit_callback_ = ImeFeature::ShowImeCallback(); |
| } |
| +} // namespace app |
| } // namespace client |
| } // namespace blimp |