Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | |
| 2 // Use of this source code is governed by a BSD-style license that can be | |
| 3 // found in the LICENSE file. | |
| 4 | |
| 5 #include <blimp/client/feature/ime_feature.h> | |
| 6 #include <string> | |
| 7 | |
| 8 #include "blimp/common/create_blimp_message.h" | |
| 9 #include "blimp/common/proto/blimp_message.pb.h" | |
| 10 #include "blimp/net/input_message_converter.h" | |
| 11 #include "net/base/net_errors.h" | |
| 12 | |
| 13 namespace blimp { | |
| 14 namespace client { | |
| 15 | |
| 16 ImeFeature::ImeFeature() | |
| 17 : delegate_(nullptr), tab_id_(-1), render_widget_id_(0) {} | |
| 18 | |
| 19 ImeFeature::~ImeFeature() {} | |
| 20 | |
| 21 void ImeFeature::OnImeTextEntered(const std::string& text) { | |
| 22 DCHECK(tab_id_ >= 0 && render_widget_id_ > 0); | |
|
Wez
2016/03/22 21:43:38
nit: Replace these w/ separate:
DCHECK_LE(0, tab_
shaktisahu
2016/03/22 23:45:42
Done.
| |
| 23 | |
| 24 ImeMessage* ime_message; | |
| 25 scoped_ptr<BlimpMessage> blimp_message = | |
| 26 CreateBlimpMessage(&ime_message, tab_id_); | |
| 27 ime_message->set_render_widget_id(render_widget_id_); | |
| 28 ime_message->set_type(ImeMessage::SET_TEXT); | |
| 29 ime_message->set_ime_text(text); | |
| 30 | |
| 31 outgoing_message_processor_->ProcessMessage(std::move(blimp_message), | |
| 32 net::CompletionCallback()); | |
| 33 } | |
| 34 | |
| 35 void ImeFeature::ProcessMessage(scoped_ptr<BlimpMessage> message, | |
| 36 const net::CompletionCallback& callback) { | |
| 37 DCHECK(!callback.is_null()); | |
| 38 DCHECK(message->type() == BlimpMessage::IME); | |
| 39 | |
| 40 DCHECK(delegate_); | |
| 41 | |
| 42 const ImeMessage& ime_message = message->ime(); | |
| 43 | |
| 44 switch (ime_message.type()) { | |
|
Wez
2016/03/22 21:43:38
You haven't checked whether |ime_message| actually
shaktisahu
2016/03/22 23:45:42
Ok. I will explicitly add a [default = UNKNOWN] ta
| |
| 45 case ImeMessage::SHOW_IME: | |
| 46 if (message->target_tab_id() < 0 || ime_message.render_widget_id() <= 0) { | |
|
Wez
2016/03/22 21:43:38
Similarly, you haven't checked whether the sender
shaktisahu
2016/03/22 23:45:42
Done.
| |
| 47 callback.Run(net::ERR_INVALID_ARGUMENT); | |
| 48 return; | |
| 49 } | |
| 50 | |
| 51 tab_id_ = message->target_tab_id(); | |
| 52 render_widget_id_ = ime_message.render_widget_id(); | |
| 53 | |
| 54 delegate_->OnShowImeRequested( | |
| 55 InputMessageConverter::TextInputTypeFromProto( | |
| 56 ime_message.text_input_type()), | |
| 57 ime_message.ime_text()); | |
| 58 break; | |
| 59 case ImeMessage::HIDE_IME: | |
| 60 tab_id_ = -1; | |
| 61 render_widget_id_ = 0; | |
| 62 delegate_->OnHideImeRequested(); | |
| 63 break; | |
| 64 case ImeMessage::SET_TEXT: | |
| 65 case ImeMessage::UNKNOWN: | |
| 66 NOTREACHED(); | |
| 67 callback.Run(net::ERR_UNEXPECTED); | |
| 68 return; | |
| 69 } | |
| 70 | |
| 71 callback.Run(net::OK); | |
| 72 } | |
| 73 | |
| 74 } // namespace client | |
| 75 } // namespace blimp | |
| OLD | NEW |