Hooking up Blimp IME with BlimpContents

blimp/client/app/android/ime_helper_dialog.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BLIMP_CLIENT_APP_ANDROID_IME_HELPER_DIALOG_H_
 #define BLIMP_CLIENT_APP_ANDROID_IME_HELPER_DIALOG_H_
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
 #include "blimp/client/core/contents/ime_feature.h"
 #include "ui/base/ime/text_input_type.h"
 
 namespace blimp {
 namespace client {
+namespace app {
 
 // The native component of org.chromium.blimp.input.ImeHelperDialog.
 class ImeHelperDialog : public ImeFeature::Delegate {

[David Trainor- moved to gerrit, 2016/08/31 05:59:09]

Do we need two versions of this class?  Are they diverging that much?

[shaktisahu, 2016/08/31 17:28:21]

Not a lot though. The app version is driven by Java and doesn't understand
WindowAndroid stuff. I have to make some changes to BlimpClientSession to make
the contents version work. I think we can delete this stuff shortly.

  public:
   static bool RegisterJni(JNIEnv* env);
 
   // |ime_feature| is expected to outlive the ImeHelperDialog.
   ImeHelperDialog(JNIEnv* env,
                   const base::android::JavaParamRef<jobject>& jobj,
                   ImeFeature* ime_feature);
 
   // Brings up IME for user to enter text.
   void OnShowImeRequested(ui::TextInputType input_type,
-                          const std::string& text) override;
+                          const std::string& text,
+                          const ShowImeCallback& callback) override;
 
   // Hides IME.
   void OnHideImeRequested() override;
 
   // Methods called from Java via JNI.
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& jobj);
 
   // Sends the text entered from IME to the blimp engine.
   void OnImeTextEntered(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& jobj,
                         const base::android::JavaParamRef<jstring>& text);
 
  private:
   ~ImeHelperDialog() override;
 
   // Reference to the Java object which owns this class.
   base::android::ScopedJavaGlobalRef<jobject> java_obj_;
 
   // A bridge to the network layer which does the work of (de)serializing the
   // outgoing and incoming BlimpMessage::IME messages from the engine.
   ImeFeature* ime_feature_;
 
+  // A callback to be executed on text submission from the user.
+  ShowImeCallback textSubmitCallback_;

[David Trainor- moved to gerrit, 2016/08/31 05:59:09]

text_submit_callback_.  Could we also mention that it's the callback for the
current request?

[shaktisahu, 2016/08/31 17:28:21]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(ImeHelperDialog);
 };
 
+}  // namespace app
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_APP_ANDROID_IME_HELPER_DIALOG_H_