| 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_lookup_table.h" | 5 #include "chromeos/dbus/ibus/ibus_lookup_table.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "dbus/message.h" | 9 #include "dbus/message.h" |
| 10 #include "chromeos/dbus/ibus/ibus_text.h" | 10 #include "chromeos/dbus/ibus/ibus_text.h" |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 ibus::IBusText candidate_text; | 154 ibus::IBusText candidate_text; |
| 155 // The attributes in IBusText are not used in Chrome. | 155 // The attributes in IBusText are not used in Chrome. |
| 156 if (!PopIBusText(&text_array_reader, &candidate_text)) { | 156 if (!PopIBusText(&text_array_reader, &candidate_text)) { |
| 157 LOG(ERROR) << "Invalid variant structure[IBusLookupTable]: " | 157 LOG(ERROR) << "Invalid variant structure[IBusLookupTable]: " |
| 158 << "6th argument should be array of IBusText."; | 158 << "6th argument should be array of IBusText."; |
| 159 return false; | 159 return false; |
| 160 } | 160 } |
| 161 IBusLookupTable::Entry entry; | 161 IBusLookupTable::Entry entry; |
| 162 entry.value = candidate_text.text(); | 162 entry.value = candidate_text.text(); |
| 163 entry.annotation = candidate_text.annotation(); | 163 entry.annotation = candidate_text.annotation(); |
| 164 entry.description = candidate_text.description(); | 164 entry.description_title = candidate_text.description_title(); |
| 165 entry.description_body = candidate_text.description_body(); |
| 165 candidates->push_back(entry); | 166 candidates->push_back(entry); |
| 166 } | 167 } |
| 167 | 168 |
| 168 dbus::MessageReader label_array_reader(NULL); | 169 dbus::MessageReader label_array_reader(NULL); |
| 169 if (!ibus_object_reader.PopArray(&label_array_reader)) { | 170 if (!ibus_object_reader.PopArray(&label_array_reader)) { |
| 170 LOG(ERROR) << "Invalid variant structure[IBusLookupTable]: " | 171 LOG(ERROR) << "Invalid variant structure[IBusLookupTable]: " |
| 171 << "7th argument should be array."; | 172 << "7th argument should be array."; |
| 172 return false; | 173 return false; |
| 173 } | 174 } |
| 174 | 175 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 } | 210 } |
| 210 | 211 |
| 211 IBusLookupTable::Entry::Entry() { | 212 IBusLookupTable::Entry::Entry() { |
| 212 } | 213 } |
| 213 | 214 |
| 214 IBusLookupTable::Entry::~Entry() { | 215 IBusLookupTable::Entry::~Entry() { |
| 215 } | 216 } |
| 216 | 217 |
| 217 } // namespace ibus | 218 } // namespace ibus |
| 218 } // namespace chromeos | 219 } // namespace chromeos |
| OLD | NEW |