Clean Up: Remove ibus namespace.

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 <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/ibus/ibus_property.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
 
 namespace base {
 class Value;
 }  // namespace base
 
 namespace dbus {
 class MessageReader;
 class MessageWriter;
 }  // namespace dbus
 
 namespace chromeos {
-// TODO(nona): Remove ibus namespace after complete libibus removal.
-namespace ibus {
 
 // The data structure of IBusObject is represented as variant in "(sav...)"
 // signature. The IBusObject is constructed with two sections, header and
 // contents. The header section is represent as "sav" which contains type name
 // and attachment array. The contents section is corresponding to "..." in
 // above signature, which can store arbitrary type values including IBusObject.
 //
 // DATA STRUCTURE OVERVIEW:
 //
 // variant  // Handle with top_variant_writer_/top_variant_reader_.
@@ skipping 78 matching lines @@
   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);
 
   // Pops a IBusText.
   // Returns true on success.
-  bool PopIBusText(ibus::IBusText* text);
+  bool PopIBusText(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);
 
   // Pops a IBusProperty.
-  bool PopIBusProperty(ibus::IBusProperty* property);
+  bool PopIBusProperty(IBusProperty* property);
 
   // Pops a IBusPropertyList.
-  bool PopIBusPropertyList(ibus::IBusPropertyList* property_list);
+  bool PopIBusPropertyList(IBusPropertyList* property_list);
 
   // Gets attachment entry corresponding to |key|. Do not free returned value.
   // Returns NULL if there is no entry.
   const base::Value* GetAttachment(const std::string& key);
 
  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.
@@ skipping 68 matching lines @@
                  dbus::MessageWriter* writer);
   void CloseContainer(dbus::MessageWriter* writer);
 
   // Sets up |writer| for writing new IBusObject entry.
   void AppendIBusObject(IBusObjectWriter* writer);
 
   // Closes all opened containers.
   void CloseAll();
 
   // Appends a IBusText.
-  void AppendIBusText(const ibus::IBusText& text);
+  void AppendIBusText(const 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);
 
   // Appends a IBusProperty.
-  void AppendIBusProperty(const ibus::IBusProperty& property);
+  void AppendIBusProperty(const IBusProperty& property);
 
   // Appends a IBusPropertyList.
-  void AppendIBusPropertyList(const ibus::IBusPropertyList& property_list);
+  void AppendIBusPropertyList(const IBusPropertyList& property_list);
 
  private:
   // Appends IBusObject headers, should be called once.
   void Init();
 
   std::string type_name_;
   std::string signature_;
   dbus::MessageWriter* original_writer_;
   WriterState state_;
   scoped_ptr<dbus::MessageWriter> top_variant_writer_;
   scoped_ptr<dbus::MessageWriter> contents_writer_;
   scoped_ptr<dbus::MessageWriter> attachment_writer_;
 
   DISALLOW_COPY_AND_ASSIGN(IBusObjectWriter);
 };
 
-}  // namespace ibus
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_IBUS_IBUS_OBJECT_H_