Clean Up: Remove ibus namespace.

chromeos/dbus/ibus/ibus_lookup_table.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_lookup_table.h"
 
 #include <string>
 #include "base/logging.h"
 #include "base/values.h"
 #include "chromeos/dbus/ibus/ibus_object.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
 #include "dbus/message.h"
 
 namespace chromeos {
-// TODO(nona): Remove ibus namespace after complete libibus removal.
-namespace ibus {
 
 namespace {
 // The default entry number of a page in IBusLookupTable.
 const int kDefaultPageSize = 9;
 const char kShowWindowAtCompositionKey[] = "show_window_at_composition";
 }  // namespace
 
 void AppendIBusLookupTable(const IBusLookupTable& table,
                            dbus::MessageWriter* writer) {
   IBusObjectWriter ibus_lookup_table_writer("IBusLookupTable",
                                             "uubbiavav",
                                             writer);
   scoped_ptr<base::Value> show_position(
       base::Value::CreateBooleanValue(table.show_window_at_composition()));
   ibus_lookup_table_writer.AddAttachment(kShowWindowAtCompositionKey,
                                          *show_position.get());
   ibus_lookup_table_writer.CloseHeader();
   ibus_lookup_table_writer.AppendUint32(table.page_size());
   ibus_lookup_table_writer.AppendUint32(table.cursor_position());
   ibus_lookup_table_writer.AppendBool(table.is_cursor_visible());
   ibus_lookup_table_writer.AppendBool(false);  // Not used in Chrome.
   ibus_lookup_table_writer.AppendInt32(static_cast<int32>(table.orientation()));
 
   const std::vector<IBusLookupTable::Entry>& candidates = table.candidates();
   dbus::MessageWriter text_writer(NULL);
   ibus_lookup_table_writer.OpenArray("v", &text_writer);
   bool have_labels = false;
   for (size_t i = 0; i < candidates.size(); ++i) {
     // Write candidate string as IBusText.
-    ibus::IBusText text;
+    IBusText text;
     text.set_text(candidates[i].value);
     text.set_annotation(candidates[i].annotation);
     text.set_description_title(candidates[i].description_title);
     text.set_description_body(candidates[i].description_body);
     AppendIBusText(text, &text_writer);
     if (!candidates[i].label.empty())
       have_labels = true;
   }
   ibus_lookup_table_writer.CloseContainer(&text_writer);
 
@@ skipping 68 matching lines @@
 
   dbus::MessageReader text_array_reader(NULL);
   if (!ibus_object_reader.PopArray(&text_array_reader)) {
     LOG(ERROR) << "Invalid variant structure[IBusLookupTable]: "
                << "6th argument should be array.";
     return false;
   }
 
   std::vector<IBusLookupTable::Entry>* candidates = table->mutable_candidates();
   while (text_array_reader.HasMoreData()) {
-    ibus::IBusText candidate_text;
+    IBusText candidate_text;
     // The attributes in IBusText are not used in Chrome.
     if (!PopIBusText(&text_array_reader, &candidate_text)) {
       LOG(ERROR) << "Invalid variant structure[IBusLookupTable]: "
                  << "6th argument should be array of IBusText.";
       return false;
     }
     IBusLookupTable::Entry entry;
     entry.value = candidate_text.text();
     entry.annotation = candidate_text.annotation();
     entry.description_title = candidate_text.description_title();
@@ skipping 76 matching lines @@
   candidates_.clear();
   candidates_ = table.candidates_;
 }
 
 IBusLookupTable::Entry::Entry() {
 }
 
 IBusLookupTable::Entry::~Entry() {
 }
 
-}  // namespace ibus
 }  // namespace chromeos