Blimp: IME should submit form with text

blimp/client/core/contents/ime_feature.cc

 // 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.
 
 #include "blimp/client/core/contents/ime_feature.h"
 
 #include <string>
 
 #include "blimp/common/create_blimp_message.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/net/input_message_converter.h"
 #include "net/base/net_errors.h"
 
 namespace blimp {
 namespace client {
 
-ImeFeature::ImeFeature() {}
+ImeFeature::WebInputRequest::WebInputRequest()
+    : input_type(ui::TEXT_INPUT_TYPE_NONE) {}
+
+ImeFeature::WebInputRequest::~WebInputRequest() = default;
+
+ImeFeature::WebInputResponse::WebInputResponse() : submit(false) {}
+
+ImeFeature::ImeFeature() : weak_factory_(this) {}
 
 ImeFeature::~ImeFeature() {}
 
 void ImeFeature::OnImeTextEntered(int tab_id,
                                   int render_widget_id,
-                                  const std::string& text) {
+                                  const WebInputResponse& response) {
   DCHECK_LE(0, tab_id);
   DCHECK_LT(0, render_widget_id);
 
   ImeMessage* ime_message;
   std::unique_ptr<BlimpMessage> blimp_message =
       CreateBlimpMessage(&ime_message, tab_id);
   ime_message->set_render_widget_id(render_widget_id);
   ime_message->set_type(ImeMessage::SET_TEXT);
-  ime_message->set_ime_text(text);
+  ime_message->set_ime_text(response.text);
+  ime_message->set_auto_submit(response.submit);
 
   outgoing_message_processor_->ProcessMessage(std::move(blimp_message),
                                               net::CompletionCallback());
 }
 
 void ImeFeature::ProcessMessage(std::unique_ptr<BlimpMessage> message,
                                 const net::CompletionCallback& callback) {
   DCHECK(!callback.is_null());
   DCHECK_EQ(BlimpMessage::kIme, message->feature_case());
 
   DCHECK(delegate_);
 
   const ImeMessage& ime_message = message->ime();
 
   switch (ime_message.type()) {
     case ImeMessage::SHOW_IME:
       if (!message->has_target_tab_id() || message->target_tab_id() < 0 ||
           ime_message.render_widget_id() <= 0) {
         callback.Run(net::ERR_INVALID_ARGUMENT);
         return;
       }
       {
-        ShowImeCallback show_ime_callback = base::Bind(
-            &ImeFeature::OnImeTextEntered, base::Unretained(this),
+        WebInputRequest request;
+        request.input_type = InputMessageConverter::TextInputTypeFromProto(
+            ime_message.text_input_type());
+        request.text = ime_message.ime_text();
+        request.show_ime_callback = base::Bind(
+            &ImeFeature::OnImeTextEntered, weak_factory_.GetWeakPtr(),
             message->target_tab_id(), ime_message.render_widget_id());
-        delegate_->OnShowImeRequested(
-            InputMessageConverter::TextInputTypeFromProto(
-                ime_message.text_input_type()),
-            ime_message.ime_text(), show_ime_callback);
+
+        delegate_->OnShowImeRequested(request);
       }
       break;
     case ImeMessage::HIDE_IME:
       delegate_->OnHideImeRequested();
       break;
     case ImeMessage::SET_TEXT:
     case ImeMessage::UNKNOWN:
       NOTREACHED();
       callback.Run(net::ERR_UNEXPECTED);
       return;
   }
 
   callback.Run(net::OK);
 }
 
 }  // namespace client
 }  // namespace blimp