Clean Up: Remove ibus namespace.

chrome/browser/chromeos/input_method/ibus_controller_impl.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 "chrome/browser/chromeos/input_method/ibus_controller_impl.h"
 
 #include <algorithm>  // for std::reverse.
 #include <cstdio>
 #include <cstring>  // for std::strcmp.
 #include <set>
@@ skipping 64 matching lines @@
     if (key == kInputMethodPropertyKeysBlacklist[i])
       return true;
   }
   return false;
 }
 
 // This function is called by and FlattenProperty() and converts IBus
 // representation of a property, |ibus_prop|, to our own and push_back the
 // result to |out_prop_list|. This function returns true on success, and
 // returns false if sanity checks for |ibus_prop| fail.
-bool ConvertProperty(const ibus::IBusProperty& ibus_prop,
+bool ConvertProperty(const IBusProperty& ibus_prop,
                      InputMethodPropertyList* out_prop_list) {
   DCHECK(out_prop_list);
   DCHECK(ibus_prop.key().empty());
-  ibus::IBusProperty::IBusPropertyType type = ibus_prop.type();
+  IBusProperty::IBusPropertyType type = ibus_prop.type();
 
   // Sanity checks.
   const bool has_sub_props = !ibus_prop.sub_properties().empty();
-  if (has_sub_props && (type != ibus::IBusProperty::IBUS_PROPERTY_TYPE_MENU)) {
+  if (has_sub_props && (type != IBusProperty::IBUS_PROPERTY_TYPE_MENU)) {
     DVLOG(1) << "The property has sub properties, "
              << "but the type of the property is not PROP_TYPE_MENU";
     return false;
   }
   if ((!has_sub_props) &&
-      (type == ibus::IBusProperty::IBUS_PROPERTY_TYPE_MENU)) {
+      (type == IBusProperty::IBUS_PROPERTY_TYPE_MENU)) {
     // This is usually not an error. ibus-daemon sometimes sends empty props.
     DVLOG(1) << "Property list is empty";
     return false;
   }
-  if (type == ibus::IBusProperty::IBUS_PROPERTY_TYPE_SEPARATOR ||
-      type == ibus::IBusProperty::IBUS_PROPERTY_TYPE_MENU) {
+  if (type == IBusProperty::IBUS_PROPERTY_TYPE_SEPARATOR ||
+      type == IBusProperty::IBUS_PROPERTY_TYPE_MENU) {
     // This is not an error, but we don't push an item for these types.
     return true;
   }
 
   // This label will be localized later.
   // See chrome/browser/chromeos/input_method/input_method_util.cc.
   std::string label_to_use;
   if (!ibus_prop.tooltip().empty())
     label_to_use = ibus_prop.tooltip();
   else if (!ibus_prop.label().empty())
     label_to_use = ibus_prop.label();
   else
     label_to_use = ibus_prop.key();
 
   out_prop_list->push_back(InputMethodProperty(
       ibus_prop.key(),
       label_to_use,
-      (type == ibus::IBusProperty::IBUS_PROPERTY_TYPE_RADIO),
+      (type == IBusProperty::IBUS_PROPERTY_TYPE_RADIO),
       ibus_prop.checked()));
   return true;
 }
 
 // Converts |ibus_prop| to |out_prop_list|. Please note that |ibus_prop|
 // may or may not have children. See the comment for FlattenPropertyList
 // for details. Returns true if no error is found.
-bool FlattenProperty(const ibus::IBusProperty& ibus_prop,
+bool FlattenProperty(const IBusProperty& ibus_prop,
                      InputMethodPropertyList* out_prop_list) {
   DCHECK(out_prop_list);
 
   // Filter out unnecessary properties.
   if (PropertyKeyIsBlacklisted(ibus_prop.key()))
     return true;
 
   // Convert |prop| to InputMethodProperty and push it to |out_prop_list|.
   if (!ConvertProperty(ibus_prop, out_prop_list))
     return false;
 
   // Process childrens iteratively (if any). Push all sub properties to the
   // stack.
   if (!ibus_prop.sub_properties().empty()) {
-    const ibus::IBusPropertyList& sub_props = ibus_prop.sub_properties();
+    const IBusPropertyList& sub_props = ibus_prop.sub_properties();
     for (size_t i = 0; i < sub_props.size(); ++i) {
       if (!FlattenProperty(*sub_props[i], out_prop_list))
         return false;
     }
   }
   return true;
 }
 
 // Converts IBus representation of a property list, |ibus_prop_list| to our
 // own. This function also flatten the original list (actually it's a tree).
@@ skipping 11 matching lines @@
 //  |               |- Item-3-3
 //  |- Item-4
 //
 // (Note: Item-3-X is a selection item since they're on a sub menu.)
 //
 // Output:
 //
 // Item-1, Item-2, Item-3-1, Item-3-2, Item-3-3, Item-4
 // (Note: SubMenuRoot does not appear in the output.)
 // ======================================================================
-bool FlattenPropertyList(const ibus::IBusPropertyList& ibus_prop_list,
+bool FlattenPropertyList(const IBusPropertyList& ibus_prop_list,
                          InputMethodPropertyList* out_prop_list) {
   DCHECK(out_prop_list);
 
   bool result = true;
   for (size_t i = 0; i < ibus_prop_list.size(); ++i) {
     result &= FlattenProperty(*ibus_prop_list[i], out_prop_list);
   }
   return result;
 }
 
@@ skipping 108 matching lines @@
   // When |id| and |current_input_method_id_| are the same, the properties
   // shouldn't be cleared. If we do that, something wrong happens in step #4
   // below:
   // 1. Enable "xkb:us::eng" and "mozc". Switch to "mozc".
   // 2. Focus Omnibox. IME properties for mozc are sent to Chrome.
   // 3. Switch to "xkb:us::eng". No function in this file is called.
   // 4. Switch back to "mozc". ChangeInputMethod("mozc") is called, but it's
   //    basically NOP since ibus-daemon's current IME is already "mozc".
   //    IME properties are not sent to Chrome for the same reason.
   if (id != current_input_method_id_) {
-    const ibus::IBusPropertyList empty_list;
+    const IBusPropertyList empty_list;
     RegisterProperties(empty_list);
   }
 
   current_input_method_id_ = id;
 
   if (!IBusConnectionsAreAlive()) {
     DVLOG(1) << "ChangeInputMethod: IBus connection is not alive (yet).";
     // |id| will become usable shortly since Start() has already been called.
     // Just return true.
   } else {
@@ skipping 86 matching lines @@
                                  value.string_list_value,
                                  base::Bind(&ConfigSetValueErrorCallback));
       return true;
     default:
       NOTREACHED() << "SendInputMethodConfig: unknown value.type";
       return false;
   }
 }
 
 void IBusControllerImpl::RegisterProperties(
-    const ibus::IBusPropertyList& ibus_prop_list) {
+    const IBusPropertyList& ibus_prop_list) {
   // Note: |panel| can be NULL. See ChangeInputMethod().
   current_property_list_.clear();
   if (!FlattenPropertyList(ibus_prop_list, &current_property_list_))
     current_property_list_.clear(); // Clear properties on errors.
   FOR_EACH_OBSERVER(Observer, observers_, PropertyChanged());
 }
 
-void IBusControllerImpl::UpdateProperty(const ibus::IBusProperty& ibus_prop) {
+void IBusControllerImpl::UpdateProperty(const IBusProperty& ibus_prop) {
   InputMethodPropertyList prop_list;  // our representation.
   if (!FlattenProperty(ibus_prop, &prop_list)) {
     // Don't update the UI on errors.
     DVLOG(1) << "Malformed properties are detected";
     return;
   }
 
   // Notify the change.
   if (!prop_list.empty()) {
     for (size_t i = 0; i < prop_list.size(); ++i) {
@@ skipping 171 matching lines @@
 
 // static
 bool IBusControllerImpl::FindAndUpdatePropertyForTesting(
     const chromeos::input_method::InputMethodProperty& new_prop,
     chromeos::input_method::InputMethodPropertyList* prop_list) {
   return FindAndUpdateProperty(new_prop, prop_list);
 }
 
 }  // namespace input_method
 }  // namespace chromeos