Extends IBusObject.

chromeos/dbus/ibus/ibus_object.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_OBJECT_H_
 #define CHROMEOS_DBUS_IBUS_IBUS_OBJECT_H_
 
 #include <string>
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/chromeos_export.h"
+#include "chromeos/dbus/ibus/ibus_text.h"
 
 namespace dbus {
 class MessageReader;
 class MessageWriter;
 }  // dbus
 
 namespace chromeos {
 
 // The data structure of IBusObject is represented as variant in "(sav...)"
 // signatur. The IBusObject is constructed with two sections, header and
@@ skipping 70 matching lines @@
   bool PopString(std::string* out);
   bool PopUint32(uint32* out);
   bool PopArray(dbus::MessageReader* reader);
   bool PopBool(bool* out);
   bool PopInt32(int32* out);
   bool HasMoreData();
 
   // Sets up |reader| for reading an IBusObject entry.
   bool PopIBusObject(IBusObjectReader* reader);
 
-  // Returns main reader if the specified IBusObject is valid, otherwise returns
-  // NULL. This reader corresponds to second depth struct field(see above
-  // description). This function is useful in the case of adding other
-  // IBusObjects.
-  dbus::MessageReader* GetContentsReader();
+  // Pops a IBusText.
+  // Returns true on success.
+  bool PopIBusText(ibus::IBusText* text);
+
+  // Pops a IBusText and store it's text field into |text|. Use PopIBusText
+  // instead in the case of using any attribute entries in IBusText.
+  // Return true on success.
+  bool PopStringFromIBusText(std::string* text);
 
  private:
   enum CheckResult {
     IBUS_OBJECT_VALID,  // Already checked and valid type.
     IBUS_OBJECT_INVALID,  // Already checked but invalid type.
     IBUS_OBJECT_NOT_CHECKED,  // Not checked yet.
   };
 
   std::string type_name_;
   dbus::MessageReader* original_reader_;
@@ skipping 43 matching lines @@
 
   // Sets up |writer| for writing new IBusObject entry.
   void AppendIBusObject(IBusObjectWriter* writer);
 
   // Closes all opened containers.
   void CloseAll();
 
   // Returns true if writer is initialized.
   bool IsInitialized() const;
 
-  // Returns main contents writer if it is initialized, otherwise returns NULL.
-  // this writer corresponds to second depth struct(see above description). This
-  // function is useful in the case of appeding other IBusObjects.
-  dbus::MessageWriter* GetContentsWriter();
+  // Appends a IBusText.
+  void AppendIBusText(const ibus::IBusText& text);
+
+  // Appends a string as IBusText without any attributes. Use AppendIBusText
+  // instead in the case of using any attribute entries.
+  void AppendStringAsIBusText(const std::string& text);
 
  private:
-  friend class TestableIBusObjectWriter;
   // Appends IBusObject headers, should be called once.
   void Init();
 
   std::string type_name_;
   std::string signature_;
   dbus::MessageWriter* original_writer_;
   scoped_ptr<dbus::MessageWriter> top_variant_writer_;
   scoped_ptr<dbus::MessageWriter> contents_writer_;
 
   DISALLOW_COPY_AND_ASSIGN(IBusObjectWriter);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_IBUS_IBUS_OBJECT_H_