Fix: infolist requries description title.

chromeos/dbus/ibus/ibus_text.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/ibus/ibus_text.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "chromeos/dbus/ibus/ibus_object.h"
 #include "dbus/message.h"
 
 namespace chromeos {
 // TODO(nona): Remove ibus namespace after complete libibus removal.
 namespace ibus {
 
 namespace {
 const uint32 kAttributeUnderline = 1;  // Indicates underline attribute.
 const uint32 kAttributeSelection = 2;  // Indicates background attribute.
 const char kAnnotationKey[] = "annotation";
-const char kDescriptionKey[] = "description";
+const char kDescriptionTitleKey[] = "description_title";
+const char kDescriptionBodyKey[] = "description_body";
 
 struct IBusAttribute {
   IBusAttribute() : type(0), value(0), start_index(0), end_index(0) {}
   uint32 type;
   uint32 value;
   uint32 start_index;
   uint32 end_index;
 };
 
 // Pops a IBusAttribute from |reader|.
@@ skipping 29 matching lines @@
 }  // namespace
 
 void AppendIBusText(const IBusText& ibus_text, dbus::MessageWriter* writer) {
   IBusObjectWriter ibus_text_writer("IBusText", "sv", writer);
 
   if (!ibus_text.annotation().empty()) {
       scoped_ptr<base::Value> annotation(
           base::Value::CreateStringValue(ibus_text.annotation()));
       ibus_text_writer.AddAttachment(kAnnotationKey, *annotation.get());
   }
-
-  if (!ibus_text.description().empty()) {
-      scoped_ptr<base::Value> description(
-          base::Value::CreateStringValue(ibus_text.description()));
-      ibus_text_writer.AddAttachment(kDescriptionKey, *description.get());
+  if (!ibus_text.description_title().empty()) {
+      scoped_ptr<base::Value> description_title(
+          base::Value::CreateStringValue(ibus_text.description_title()));
+      ibus_text_writer.AddAttachment(kDescriptionTitleKey,
+                                     *description_title.get());
+  }
+  if (!ibus_text.description_body().empty()) {
+      scoped_ptr<base::Value> description_body(
+          base::Value::CreateStringValue(ibus_text.description_body()));
+      ibus_text_writer.AddAttachment(kDescriptionBodyKey,
+                                     *description_body.get());
   }
   ibus_text_writer.CloseHeader();
 
   ibus_text_writer.AppendString(ibus_text.text());
 
   // Start appending IBusAttrList into IBusText
   IBusObjectWriter ibus_attr_list_writer("IBusAttrList", "av", NULL);
   ibus_text_writer.AppendIBusObject(&ibus_attr_list_writer);
   ibus_attr_list_writer.CloseHeader();
   dbus::MessageWriter attribute_array_writer(NULL);
@@ skipping 41 matching lines @@
     return false;
 
   const base::Value* annotation_value =
       ibus_text_reader.GetAttachment(kAnnotationKey);
   if (annotation_value) {
     std::string annotation;
     if (annotation_value->GetAsString(&annotation))
       ibus_text->set_annotation(annotation);
   }
 
-  const base::Value* description_value =
-      ibus_text_reader.GetAttachment(kDescriptionKey);
-  if (description_value) {
-    std::string description;
-    if (description_value->GetAsString(&description))
-      ibus_text->set_description(description);
+  const base::Value* description_title_value =
+      ibus_text_reader.GetAttachment(kDescriptionTitleKey);
+  if (description_title_value) {
+    std::string description_title;
+    if (description_title_value->GetAsString(&description_title))
+      ibus_text->set_description_title(description_title);
+  }
+
+  const base::Value* description_body_value =
+      ibus_text_reader.GetAttachment(kDescriptionBodyKey);
+  if (description_body_value) {
+    std::string description_body;
+    if (description_body_value->GetAsString(&description_body))
+      ibus_text->set_description_body(description_body);
   }
 
   std::string text;
   if (!ibus_text_reader.PopString(&text)) {
     LOG(ERROR) << "Invalid variant structure[IBusText]: "
                << "1st argument should be string.";
     return false;
   }
 
   ibus_text->set_text(text);
@@ skipping 57 matching lines @@
 // IBusText
 IBusText::IBusText()
     : text_("") {
 }
 
 IBusText::~IBusText() {
 }
 
 }  // namespace ibus
 }  // namespace chromeos