Add annotation/description member into LookupTable entry.

We can't write unittest for these because AppendIBusText does not support attachment field.

BUG=129403
TEST=ran chromeos_unittests and manually done


Review URL: https://chromiumcodereview.appspot.com/11365105

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166183 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 15 insertions, 3 deletions

diff --git a/chromeos/dbus/ibus/ibus_lookup_table.cc b/chromeos/dbus/ibus/ibus_lookup_table.cc
index 21b894a..2a926f1 100644
--- a/chromeos/dbus/ibus/ibus_lookup_table.cc
+++ b/chromeos/dbus/ibus/ibus_lookup_table.cc
@@ -151,15 +151,17 @@ bool PopIBusLookupTable(dbus::MessageReader* reader, IBusLookupTable* table) {
 
   std::vector<IBusLookupTable::Entry>* candidates = table->mutable_candidates();
   while (text_array_reader.HasMoreData()) {
-    std::string candidate_text;
+    ibus::IBusText candidate_text;
     // The attributes in IBusText are not used in Chrome.
-    if (!PopStringFromIBusText(&text_array_reader, &candidate_text)) {
+    if (!PopIBusText(&text_array_reader, &candidate_text)) {
       LOG(ERROR) << "Invalid variant structure[IBusLookupTable]: "
                  << "6th argument should be array of IBusText.";
       return false;
     }
     IBusLookupTable::Entry entry;
-    entry.value = candidate_text;
+    entry.value = candidate_text.text();
+    entry.annotation = candidate_text.annotation();
+    entry.description = candidate_text.description();
     candidates->push_back(entry);
   }
 
@@ -206,5 +208,11 @@ IBusLookupTable::IBusLookupTable()
 IBusLookupTable::~IBusLookupTable() {
 }
 
+IBusLookupTable::Entry::Entry() {
+}
+
+IBusLookupTable::Entry::~Entry() {
+}
+
 }  // namespace ibus
 }  // namespace chromeos
diff --git a/chromeos/dbus/ibus/ibus_lookup_table.h b/chromeos/dbus/ibus/ibus_lookup_table.h
index d8abfd9..73d11bd 100644
--- a/chromeos/dbus/ibus/ibus_lookup_table.h
+++ b/chromeos/dbus/ibus/ibus_lookup_table.h
@@ -90,8 +90,12 @@ class CHROMEOS_EXPORT IBusLookupTable {
   // field is represented as IBusText, but attributes are not used in Chrome.
   // So just simple string is sufficient in this case.
   struct Entry {
+    Entry();
+    virtual ~Entry();
     std::string value;
     std::string label;
+    std::string annotation;
+    std::string description;
   };
 
   IBusLookupTable();