Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(709)

Unified Diff: blimp/engine/feature/engine_render_widget_feature.cc

Issue 2513333002: Revert of Extracting placeholder information from Webkit to Blimp (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: blimp/engine/feature/engine_render_widget_feature.cc
diff --git a/blimp/engine/feature/engine_render_widget_feature.cc b/blimp/engine/feature/engine_render_widget_feature.cc
index 7d43435d59b94225fc2b6836035fd6203515ca4e..ff7f7b90925a692afd82e742b35994bf140cc965 100644
--- a/blimp/engine/feature/engine_render_widget_feature.cc
+++ b/blimp/engine/feature/engine_render_widget_feature.cc
@@ -14,7 +14,6 @@
#include "blimp/net/input_message_converter.h"
#include "content/public/browser/render_widget_host.h"
#include "content/public/browser/render_widget_host_view.h"
-#include "content/public/common/form_field_data.h"
#include "net/base/net_errors.h"
#include "third_party/WebKit/public/platform/WebInputEvent.h"
#include "ui/events/event.h"
@@ -136,7 +135,9 @@
void EngineRenderWidgetFeature::SendShowImeRequest(
const int tab_id,
content::RenderWidgetHost* render_widget_host,
- const content::FormFieldData& field) {
+ const ui::TextInputClient* client) {
+ DCHECK(client);
+
ImeMessage* ime_message;
std::unique_ptr<BlimpMessage> blimp_message =
CreateBlimpMessage(&ime_message, tab_id);
@@ -146,9 +147,13 @@
ime_message->set_render_widget_id(render_widget_id);
ime_message->set_type(ImeMessage::SHOW_IME);
ime_message->set_text_input_type(
- InputMessageConverter::TextInputTypeToProto(field.text_input_type));
- ime_message->set_ime_text(field.text);
- // TODO(shaktisahu): Add remaining fields to proto.
+ InputMessageConverter::TextInputTypeToProto(client->GetTextInputType()));
+
+ gfx::Range text_range;
+ base::string16 existing_text;
+ client->GetTextRange(&text_range);
+ client->GetTextFromRange(text_range, &existing_text);
+ ime_message->set_ime_text(base::UTF16ToUTF8(existing_text));
ime_message_sender_->ProcessMessage(std::move(blimp_message),
net::CompletionCallback());
« no previous file with comments | « blimp/engine/feature/engine_render_widget_feature.h ('k') | blimp/engine/feature/engine_render_widget_feature_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698