OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chromeos/dbus/ibus/ibus_component.h" | 5 #include "chromeos/dbus/ibus/ibus_component.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "chromeos/dbus/ibus/ibus_object.h" | 8 #include "chromeos/dbus/ibus/ibus_object.h" |
9 #include "dbus/message.h" | 9 #include "dbus/message.h" |
10 | 10 |
11 namespace chromeos { | 11 namespace chromeos { |
12 // TODO(nona): Remove ibus namespace after complete libibus removal. | |
13 namespace ibus { | |
14 | 12 |
15 namespace { | 13 namespace { |
16 | 14 |
17 bool PopIBusEngineDesc(dbus::MessageReader* reader, | 15 bool PopIBusEngineDesc(dbus::MessageReader* reader, |
18 IBusComponent::EngineDescription* engine_desc) { | 16 IBusComponent::EngineDescription* engine_desc) { |
19 IBusObjectReader ibus_object_reader("IBusEngineDesc", reader); | 17 IBusObjectReader ibus_object_reader("IBusEngineDesc", reader); |
20 if (!ibus_object_reader.Init()) | 18 if (!ibus_object_reader.Init()) |
21 return false; | 19 return false; |
22 if (!ibus_object_reader.PopString(&engine_desc->engine_id)) { | 20 if (!ibus_object_reader.PopString(&engine_desc->engine_id)) { |
23 LOG(ERROR) << "Invalid variant structure[IBusEngineDesc]: " | 21 LOG(ERROR) << "Invalid variant structure[IBusEngineDesc]: " |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
241 display_name(display_name), | 239 display_name(display_name), |
242 description(description), | 240 description(description), |
243 language_code(language_code), | 241 language_code(language_code), |
244 author(author), | 242 author(author), |
245 layout(layout) { | 243 layout(layout) { |
246 } | 244 } |
247 | 245 |
248 IBusComponent::EngineDescription::~EngineDescription() { | 246 IBusComponent::EngineDescription::~EngineDescription() { |
249 } | 247 } |
250 | 248 |
251 } // namespace ibus | |
252 } // namespace chromeos | 249 } // namespace chromeos |
OLD | NEW |