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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 224 delegate->OnCompositorMessageReceived(render_widget_host, payload); | 224 delegate->OnCompositorMessageReceived(render_widget_host, payload); |
| 225 } | 225 } |
| 226 break; | 226 break; |
| 227 case BlimpMessage::kIme: | 227 case BlimpMessage::kIme: |
| 228 DCHECK(message->ime().type() == ImeMessage::SET_TEXT); | 228 DCHECK(message->ime().type() == ImeMessage::SET_TEXT); |
| 229 render_widget_host = | 229 render_widget_host = |
| 230 GetRenderWidgetHost(target_tab_id, message->ime().render_widget_id()); | 230 GetRenderWidgetHost(target_tab_id, message->ime().render_widget_id()); |
| 231 if (render_widget_host && render_widget_host->GetView()) { | 231 if (render_widget_host && render_widget_host->GetView()) { |
| 232 SetTextFromIME(render_widget_host->GetView()->GetTextInputClient(), | 232 SetTextFromIME(render_widget_host->GetView()->GetTextInputClient(), |
| 233 message->ime().ime_text()); | 233 message->ime().ime_text()); |
| 234 | |
| 235 // TODO(shaktisahu): Remove this fake HIDE_IME request once the blimp | |
| 236 // IME design is completed. | |
| 237 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( | |
|
David Trainor- moved to gerrit
2016/10/19 16:40:31
Actually I think it's cleaner if we send this dela
shaktisahu
2016/10/27 02:42:56
Actually, today, engine is not sending a HIDE_IME
David Trainor- moved to gerrit
2016/10/28 05:08:08
Yeah I was assuming we'd just send the hide right
shaktisahu
2016/11/01 21:35:33
Done.
| |
| 238 FROM_HERE, | |
| 239 base::Bind(&EngineRenderWidgetFeature::SendHideImeRequest, | |
| 240 base::Unretained(this), target_tab_id, | |
| 241 render_widget_host), | |
| 242 base::TimeDelta::FromMilliseconds(1500)); | |
| 234 } | 243 } |
| 235 break; | 244 break; |
| 236 default: | 245 default: |
| 237 NOTREACHED(); | 246 NOTREACHED(); |
| 238 } | 247 } |
| 239 | 248 |
| 240 callback.Run(net::OK); | 249 callback.Run(net::OK); |
| 241 } | 250 } |
| 242 | 251 |
| 243 void EngineRenderWidgetFeature::OnWebPreferencesChanged() { | 252 void EngineRenderWidgetFeature::OnWebPreferencesChanged() { |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 361 IdToRenderWidgetMap::const_iterator widget_id_it = | 370 IdToRenderWidgetMap::const_iterator widget_id_it = |
| 362 id_to_render_widget->find(render_widget_id); | 371 id_to_render_widget->find(render_widget_id); |
| 363 if (widget_id_it == id_to_render_widget->end()) | 372 if (widget_id_it == id_to_render_widget->end()) |
| 364 return nullptr; | 373 return nullptr; |
| 365 | 374 |
| 366 return widget_id_it->second; | 375 return widget_id_it->second; |
| 367 } | 376 } |
| 368 | 377 |
| 369 } // namespace engine | 378 } // namespace engine |
| 370 } // namespace blimp | 379 } // namespace blimp |
| OLD | NEW |