Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "blimp/engine/feature/engine_render_widget_feature.h" | 5 #include "blimp/engine/feature/engine_render_widget_feature.h" |
| 6 | 6 |
| 7 #include "base/numerics/safe_conversions.h" | 7 #include "base/numerics/safe_conversions.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "blimp/common/create_blimp_message.h" | 9 #include "blimp/common/create_blimp_message.h" |
| 10 #include "blimp/common/proto/blimp_message.pb.h" | 10 #include "blimp/common/proto/blimp_message.pb.h" |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 128 compositor_message->set_payload(message.data(), | 128 compositor_message->set_payload(message.data(), |
| 129 base::checked_cast<int>(message.size())); | 129 base::checked_cast<int>(message.size())); |
| 130 | 130 |
| 131 compositor_message_sender_->ProcessMessage(std::move(blimp_message), | 131 compositor_message_sender_->ProcessMessage(std::move(blimp_message), |
| 132 net::CompletionCallback()); | 132 net::CompletionCallback()); |
| 133 } | 133 } |
| 134 | 134 |
| 135 void EngineRenderWidgetFeature::SendShowImeRequest( | 135 void EngineRenderWidgetFeature::SendShowImeRequest( |
| 136 const int tab_id, | 136 const int tab_id, |
| 137 content::RenderWidgetHost* render_widget_host, | 137 content::RenderWidgetHost* render_widget_host, |
| 138 const ui::TextInputClient* client) { | 138 ui::TextInputType type, |
| 139 DCHECK(client); | 139 const std::string& text, |
| 140 | 140 const std::string& placeholder) { |
|
David Trainor- moved to gerrit
2016/10/26 01:36:42
Do we want to add this to the proto as well?
shaktisahu
2016/10/31 23:13:58
Yes. I will add it in a subsequent CL for blimp ch
| |
| 141 ImeMessage* ime_message; | 141 ImeMessage* ime_message; |
| 142 std::unique_ptr<BlimpMessage> blimp_message = | 142 std::unique_ptr<BlimpMessage> blimp_message = |
| 143 CreateBlimpMessage(&ime_message, tab_id); | 143 CreateBlimpMessage(&ime_message, tab_id); |
| 144 | 144 |
| 145 int render_widget_id = GetRenderWidgetId(tab_id, render_widget_host); | 145 int render_widget_id = GetRenderWidgetId(tab_id, render_widget_host); |
| 146 DCHECK_GT(render_widget_id, 0); | 146 DCHECK_GT(render_widget_id, 0); |
| 147 ime_message->set_render_widget_id(render_widget_id); | 147 ime_message->set_render_widget_id(render_widget_id); |
| 148 ime_message->set_type(ImeMessage::SHOW_IME); | 148 ime_message->set_type(ImeMessage::SHOW_IME); |
| 149 ime_message->set_text_input_type( | 149 ime_message->set_text_input_type( |
| 150 InputMessageConverter::TextInputTypeToProto(client->GetTextInputType())); | 150 InputMessageConverter::TextInputTypeToProto(type)); |
| 151 | 151 ime_message->set_ime_text(text); |
| 152 gfx::Range text_range; | |
| 153 base::string16 existing_text; | |
| 154 client->GetTextRange(&text_range); | |
| 155 client->GetTextFromRange(text_range, &existing_text); | |
| 156 ime_message->set_ime_text(base::UTF16ToUTF8(existing_text)); | |
| 157 | 152 |
| 158 ime_message_sender_->ProcessMessage(std::move(blimp_message), | 153 ime_message_sender_->ProcessMessage(std::move(blimp_message), |
| 159 net::CompletionCallback()); | 154 net::CompletionCallback()); |
| 160 } | 155 } |
| 161 | 156 |
| 162 void EngineRenderWidgetFeature::SendHideImeRequest( | 157 void EngineRenderWidgetFeature::SendHideImeRequest( |
| 163 const int tab_id, | 158 const int tab_id, |
| 164 content::RenderWidgetHost* render_widget_host) { | 159 content::RenderWidgetHost* render_widget_host) { |
| 165 ImeMessage* ime_message; | 160 ImeMessage* ime_message; |
| 166 std::unique_ptr<BlimpMessage> blimp_message = | 161 std::unique_ptr<BlimpMessage> blimp_message = |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 386 IdToRenderWidgetMap::const_iterator widget_id_it = | 381 IdToRenderWidgetMap::const_iterator widget_id_it = |
| 387 id_to_render_widget->find(render_widget_id); | 382 id_to_render_widget->find(render_widget_id); |
| 388 if (widget_id_it == id_to_render_widget->end()) | 383 if (widget_id_it == id_to_render_widget->end()) |
| 389 return nullptr; | 384 return nullptr; |
| 390 | 385 |
| 391 return widget_id_it->second; | 386 return widget_id_it->second; |
| 392 } | 387 } |
| 393 | 388 |
| 394 } // namespace engine | 389 } // namespace engine |
| 395 } // namespace blimp | 390 } // namespace blimp |
| OLD | NEW |