Extends IBusObject.

chromeos/dbus/ibus/ibus_object.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_object.h"
 
 #include "base/logging.h"
 #include "dbus/message.h"
 
 namespace chromeos {
@@ skipping 74 matching lines @@
   DCHECK(contents_reader_.get());
   return IsValid() && contents_reader_->PopString(out);
 }
 
 bool IBusObjectReader::PopUint32(uint32* out) {
   DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
   DCHECK(contents_reader_.get());
   return IsValid() && contents_reader_->PopUint32(out);
 }
 
+bool IBusObjectReader::PopInt32(int32* out) {
+  DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
+  DCHECK(contents_reader_.get());
+  return IsValid() && contents_reader_->PopInt32(out);
+}
+
+bool IBusObjectReader::PopBool(bool* out) {
+  DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
+  DCHECK(contents_reader_.get());
+  return IsValid() && contents_reader_->PopBool(out);
+}
+
 bool IBusObjectReader::PopArray(dbus::MessageReader* reader) {
   DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
   DCHECK(contents_reader_.get());
   return IsValid() && contents_reader_->PopArray(reader);
 }
 
 bool IBusObjectReader::HasMoreData() {
   DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
   DCHECK(contents_reader_.get());
   return IsValid() && contents_reader_->HasMoreData();
 }
 
 bool IBusObjectReader::PopIBusObject(IBusObjectReader* reader) {
   DCHECK(contents_reader_.get());
   if (!IsValid())
     return false;
   return reader->InitWithParentReader(contents_reader_.get());
 }
 
 bool IBusObjectReader::IsValid() const {
   DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
   return check_result_ == IBUS_OBJECT_VALID;
 }
 
+dbus::MessageReader* IBusObjectReader::GetContentsReader() {
+  DCHECK_NE(IBUS_OBJECT_NOT_CHECKED, check_result_);
+  DCHECK(contents_reader_.get());
+  if (IsValid()) {
+    return contents_reader_.get();
+  } else {
+    return NULL;
+  }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 //  IBusObjectWriter
 IBusObjectWriter::IBusObjectWriter(const std::string& type_name,
                                    const std::string& signature,
                                    dbus::MessageWriter* writer)
     : type_name_(type_name),
       signature_(signature),
       original_writer_(writer) {
   if (original_writer_)
     Init();
 }
 
 IBusObjectWriter::~IBusObjectWriter() {
 }
 
 void IBusObjectWriter::AppendString(const std::string& input) {
   DCHECK(IsInitialized());
   contents_writer_->AppendString(input);
 }
 
 void IBusObjectWriter::AppendUint32(uint32 input) {
   DCHECK(IsInitialized());
   contents_writer_->AppendUint32(input);
 }
 
+void IBusObjectWriter::AppendInt32(int32 input) {
+  DCHECK(IsInitialized());
+  contents_writer_->AppendInt32(input);
+}
+
+void IBusObjectWriter::AppendBool(bool input) {
+  DCHECK(IsInitialized());
+  contents_writer_->AppendBool(input);
+}
+
 void IBusObjectWriter::OpenArray(const std::string& signature,
                                  dbus::MessageWriter* writer) {
   DCHECK(IsInitialized());
   contents_writer_->OpenArray(signature, writer);
 }
 
 void IBusObjectWriter::CloseContainer(dbus::MessageWriter* writer) {
   DCHECK(IsInitialized());
   contents_writer_->CloseContainer(writer);
 }
@@ skipping 37 matching lines @@
   top_variant_writer_->CloseContainer(contents_writer_.get());
   original_writer_->CloseContainer(top_variant_writer_.get());
   top_variant_writer_.reset();
   contents_writer_.reset();
 }
 
 bool IBusObjectWriter::IsInitialized() const {
   return contents_writer_.get() != NULL;
 }
 
+dbus::MessageWriter* IBusObjectWriter::GetContentsWriter() {
+  DCHECK(contents_writer_.get());
+  if (IsInitialized()) {
+    return contents_writer_.get();
+  } else {
+    return NULL;
+  }
+}
+
 }  // namespace chromeos