Use annotation field for better looking.

This cl depends on https://codereview.chromium.org/11411063

BUG=140186
TEST=Manually done on lumpy with sample IME.

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

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

chrome/browser/chromeos/input_method/input_method_engine_ibus.cc

@@ -273,9 +273,9 @@ bool InputMethodEngineIBus::SetCandidates(
   for (std::vector<Candidate>::const_iterator ix = candidates.begin();
        ix != candidates.end(); ++ix) {
     ibus::IBusLookupTable::Entry entry;
-    // TODO(nona): support annotation(crbug.com/140186).
-    entry.value = ix->value + " " + ix->annotation;
+    entry.value = ix->value;
     entry.label = ix->label;
+    entry.annotation = ix->annotation;
 
     // Store a mapping from the user defined ID to the candidate index.
     candidate_indexes_[ix->id] = candidate_ids_.size();

chromeos/dbus/ibus/ibus_lookup_table.cc

@@ -43,7 +43,10 @@ void AppendIBusLookupTable(const IBusLookupTable& table,
   bool have_labels = false;
   for (size_t i = 0; i < candidates.size(); ++i) {
     // Write candidate string as IBusText.
-    AppendStringAsIBusText(candidates[i].value, &text_writer);
+    ibus::IBusText text;
+    text.set_text(candidates[i].value);
+    text.set_annotation(candidates[i].annotation);
+    AppendIBusText(text, &text_writer);
     if (!candidates[i].label.empty())
       have_labels = true;
   }