Extends IBusText to handle mozc's extended field.

chromeos/dbus/ibus/ibus_text.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_IBUS_IBUS_TEXT_H_
 #define CHROMEOS_DBUS_IBUS_IBUS_TEXT_H_
 
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
@@ skipping 69 matching lines @@
 
 // Pops a IBusText from |reader|.
 // Returns false if an error occures.
 bool CHROMEOS_EXPORT PopIBusText(dbus::MessageReader* reader,
                                  IBusText* ibus_text);
 // Pops a IBusText from |reader| and stores it's text field into text. Use
 // PopIBusText instead in the case of using any attribute entries in IBusText.
 // Returns true on success.
 bool CHROMEOS_EXPORT PopStringFromIBusText(dbus::MessageReader* reader,
                                            std::string* text);
-// Appends a IBusText to |writer|.
+// Appends a IBusText to |writer|. Annotation and description field is not
+// filled with AppendIBusText.
+// TODO(nona): Support annotation/description appending if necessary.
 void CHROMEOS_EXPORT AppendIBusText(const IBusText& ibus_text,
                                     dbus::MessageWriter* writer);
 
 // Appends a string to |writer| as IBusText without any attributes. Use
 // AppendIBusText instead in the case of using any attribute entries.
+// TODO(nona): Support annotation/description appending if necessary.
 void CHROMEOS_EXPORT AppendStringAsIBusText(const std::string& text,
                                             dbus::MessageWriter* writer);
 
 // Handles IBusText object which is used in dbus communication with ibus-daemon.
 // The IBusAttribute has four uint32 variables and the IBusAttributes represents
 // three type of decoration based on it's values.
 // 1. Underline decoration (corresponds to UnderlineAttribute structure)
 //   1st value: indicates underline attribute.
 //   2nd value: type of decoration. Chrome only support single and double
 //              underline and error line.
 //   3rd value: the start index of this attribute in multibyte.
 //   4th value: the end index of this attribute in multibyte.
 //
 // 2. Background decoration (corresponds to SelectionAttribute structure)
 //   NOTE: Background decoration is treated as selection in Chrome.
 //   1st value: indicates background attribute.
 //   2nd value: Represents color but not supported in Chrome.
 //   3rd value: the start index of this attribute in multibyte.
 //   4th value: the end index of this attribute in multibyte.
 //
 // 3. Forward decoration
 //   Not supported in Chrome.
-// TODO(nona): Support attachment for mozc infolist feature(crosbug.com/30653).
 class CHROMEOS_EXPORT IBusText {
  public:
   enum IBusTextUnderlineType {
     IBUS_TEXT_UNDERLINE_SINGLE = 1,
     IBUS_TEXT_UNDERLINE_DOUBLE = 2,
     IBUS_TEXT_UNDERLINE_ERROR  = 4,
   };
 
   struct UnderlineAttribute {
     IBusTextUnderlineType type;
     uint32 start_index;  // The inclusive start index.
     uint32 end_index;  // The exclusive end index.
   };
 
   struct SelectionAttribute {
     uint32 start_index;  // The inclusive start index.
     uint32 end_index;  // The exclusive end index.
   };
 
   // Accessors
   IBusText();
   virtual ~IBusText();
 
-  std::string text() const;
-  void set_text(const std::string& text);
+  std::string text() const { return text_; }

[satorux1, 2012/11/05 04:29:16]

const std::string& text()

[Seigo Nonaka, 2012/11/05 05:27:42]

Done.

+  void set_text(const std::string& text) { text_ = text; }
 
-  const std::vector<UnderlineAttribute>& underline_attributes() const;
-  std::vector<UnderlineAttribute>* mutable_underline_attributes();
+  std::string annotation() const { return annotation_; }

[satorux1, 2012/11/05 04:29:16]

ditto. please fix other places too.

[Seigo Nonaka, 2012/11/05 05:27:42]

Done.

+  void set_annotation(const std::string& annotation) {
+    annotation_ = annotation;
+  }
 
-  const std::vector<SelectionAttribute>& selection_attributes() const;
-  std::vector<SelectionAttribute>* mutable_selection_attributes();
+  std::string description() const { return description_; }
+  void set_description(const std::string& description) {
+    description_ = description;
+  }
+
+  const std::vector<UnderlineAttribute>& underline_attributes() const {
+    return underline_attributes_;
+  }
+
+  std::vector<UnderlineAttribute>* mutable_underline_attributes() {
+    return &underline_attributes_;
+  }
+
+  const std::vector<SelectionAttribute>& selection_attributes() const {
+    return selection_attributes_;
+  }
+  std::vector<SelectionAttribute>* mutable_selection_attributes() {
+    return &selection_attributes_;
+  }
 
  private:
   std::string text_;
+  std::string annotation_;
+  std::string description_;
   std::vector<UnderlineAttribute> underline_attributes_;
   std::vector<SelectionAttribute> selection_attributes_;
 
   DISALLOW_COPY_AND_ASSIGN(IBusText);
 };
 
 }  // namespace ibus
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_IBUS_IBUS_TEXT_H_