Delete ibus_object and move ibus_text to chromeos/ime.

chromeos/ime/ibus_text.h

Index: chromeos/ime/ibus_text.h
diff --git a/chromeos/dbus/ibus/ibus_text.h b/chromeos/ime/ibus_text.h
similarity index 52%
rename from chromeos/dbus/ibus/ibus_text.h
rename to chromeos/ime/ibus_text.h
index 1ed7ef1cd79fd768085965d91c4dff54df802791..ce86c62db20422206af86a2f2636978ad4a1e3cf 100644
--- a/chromeos/dbus/ibus/ibus_text.h
+++ b/chromeos/ime/ibus_text.h
@@ -2,102 +2,16 @@
 // 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_
+#ifndef CHROMEOS_IME_IBUS_TEXT_H_
+#define CHROMEOS_IME_IBUS_TEXT_H_
 
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
 #include "chromeos/chromeos_export.h"
 
-namespace dbus {
-class MessageWriter;
-class MessageReader;
-}  // dbus
-
 namespace chromeos {
 
-// The IBusText is one of IBusObjects and it contains IBusAttrList object which
-// contains array of IBusAttribute object. The overview of each data structure
-// is as follows:
-//
-// DATA STRUCTURE OVERVIEW:
-//
-// IBusAttribute: (signature is "uuuu")
-// variant  struct {
-//     string "IBusAttribute"
-//     array[]
-//     uint32 1  // Type of attribute.
-//     uint32 1  // The value of attribute.
-//     uint32 0  // The start index of the text.
-//     uint32 1  // The end index of the text.
-// }
-//
-// IBusAttrList: (signature is "av")
-// variant  struct {
-//     string "IBusAttrList"
-//     array[]
-//     array[  // The array of IBusAttribute.
-//       variant  struct{
-//           string "IBusAttribute"
-//           ...
-//       }
-//       variant  struct{
-//           string "IBusAttribute"
-//           ...
-//       }
-//       variant  struct{
-//           string "IBusAttribute"
-//           ...
-//       }
-//    ]
-// }
-//
-// IBusText: (signature is "sv")
-// variant  struct {
-//     string "IBusText"
-//     array[]
-//     string "A"
-//     variant  struct {
-//         string "IBusAttrList"
-//         array[]
-//         array[
-//           variant  struct{
-//               string "IBusAttribute"
-//               ...
-//             }
-//           variant  struct{
-//               string "IBusAttribute"
-//               ...
-//             }
-//        ]
-//      }
-//  }
-//
-class IBusText;
-
-// Pops a IBusText from |reader|.
-// Returns false if an error occurs.
-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|. 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

[Seigo Nonaka, 2013/11/13 14:09:52]

Please also remove this comment. This describes IBus object structures.

[Hiro Komatsu, 2013/11/14 02:55:01]

Done.

 // three type of decoration based on it's values.
 // 1. Underline decoration (corresponds to UnderlineAttribute structure)
@@ -187,4 +101,4 @@ class CHROMEOS_EXPORT IBusText {
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_IBUS_IBUS_TEXT_H_
+#endif  // CHROMEOS_IME_IBUS_TEXT_H_