Extends IBusText I/O function.

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 "chromeos/dbus/ibus/ibus_object.h"
 #include "dbus/message.h"
 
@@ skipping 75 matching lines @@
     attribute.end_index = selection_attributes[i].end_index;
     AppendIBusAttribute(&attribute_array_writer, attribute);
   }
 
   // Close all writers.
   ibus_attr_list_writer.CloseContainer(&attribute_array_writer);
   ibus_attr_list_writer.CloseAll();
   ibus_text_writer.CloseAll();
 }
 
+void CHROMEOS_EXPORT AppendStringAsIBusText(const std::string& text,
+                                            dbus::MessageWriter* writer) {
+  IBusText ibus_text;
+  ibus_text.set_text(text);
+  AppendIBusText(ibus_text, writer);
+}
+
 bool PopIBusText(dbus::MessageReader* reader, IBusText* ibus_text) {
   IBusObjectReader ibus_text_reader("IBusText", reader);
   if (!ibus_text_reader.Init())
     return false;
 
   std::string text;
   if (!ibus_text_reader.PopString(&text)) {
     LOG(ERROR) << "Invalid variant structure[IBusText]: "
                << "1st argument should be string.";
     return false;
@@ skipping 40 matching lines @@
       selection_attribute.end_index = attribute.end_index;
       selection_attributes->push_back(selection_attribute);
     } else {
       DVLOG(1) << "Chrome does not support background attribute.";
     }
   }
 
   return true;
 }
 
+bool CHROMEOS_EXPORT PopStringFromIBusText(dbus::MessageReader* reader,
+                                           std::string* text) {
+  IBusText ibus_text;
+  bool result = PopIBusText(reader, &ibus_text);
+  text->assign(ibus_text.text());

[satorux1, 2012/05/18 01:11:06]

Should we do this when |result| is false?

Maybe:

if (PopIBusText(reader, &ibus_text)) {
  *text = ibus_text.text()
  return true;
}
return false;

[Seigo Nonaka, 2012/05/18 01:18:43]

Done
On 2012/05/18 01:11:06, satorux1 wrote:

+  return result;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // IBusText
 IBusText::IBusText()
     : text_("") {
 }
 
 IBusText::~IBusText() {
 }
 
 std::string IBusText::text() const {
@@ skipping 19 matching lines @@
   return &selection_attributes_;
 }
 
 const std::vector<IBusText::SelectionAttribute>&
     IBusText::selection_attributes() const {
   return selection_attributes_;
 }
 
 }  // namespace ibus
 }  // namespace chromeos