Clean Up: remove unused variable selection_item_id

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 30 matching lines @@
 namespace {
 
 // Finds a property which has |new_prop.key| from |prop_list|, and replaces the
 // property with |new_prop|. Returns true if such a property is found.
 bool FindAndUpdateProperty(
     const chromeos::input_method::InputMethodProperty& new_prop,
     chromeos::input_method::InputMethodPropertyList* prop_list) {
   for (size_t i = 0; i < prop_list->size(); ++i) {
     chromeos::input_method::InputMethodProperty& prop = prop_list->at(i);
     if (prop.key == new_prop.key) {
-      const int saved_id = prop.selection_item_id;
-      // Update the list except the radio id. As written in
-      // chromeos_input_method.h, |prop.selection_item_id| is dummy.
       prop = new_prop;
-      prop.selection_item_id = saved_id;
       return true;
     }
   }
   return false;
 }
 
 }  // namespace
 
 namespace chromeos {
 namespace input_method {
@@ skipping 25 matching lines @@
 bool PropertyHasChildren(IBusProperty* prop) {
   return prop && ibus_property_get_sub_props(prop) &&
       ibus_prop_list_get(ibus_property_get_sub_props(prop), 0);
 }
 
 // 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(IBusProperty* ibus_prop,
-                     int selection_item_id,
                      InputMethodPropertyList* out_prop_list) {
   DCHECK(ibus_prop);
   DCHECK(out_prop_list);
 
   const IBusPropType type = ibus_property_get_prop_type(ibus_prop);
   const IBusPropState state = ibus_property_get_state(ibus_prop);
   const IBusText* tooltip = ibus_property_get_tooltip(ibus_prop);
   const IBusText* label = ibus_property_get_label(ibus_prop);
   const gchar* key = ibus_property_get_key(ibus_prop);
   DCHECK(key);
 
   // Sanity checks.
   const bool has_sub_props = PropertyHasChildren(ibus_prop);
   if (has_sub_props && (type != PROP_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 == PROP_TYPE_MENU)) {
     // This is usually not an error. ibus-daemon sometimes sends empty props.
     DVLOG(1) << "Property list is empty";
     return false;
   }
   if (type == PROP_TYPE_SEPARATOR || type == PROP_TYPE_MENU) {
     // This is not an error, but we don't push an item for these types.
     return true;
   }
 
   const bool is_selection_item = (type == PROP_TYPE_RADIO);
-  selection_item_id = is_selection_item ?
-      selection_item_id : InputMethodProperty::kInvalidSelectionItemId;
 
   bool is_selection_item_checked = false;
   if (state == PROP_STATE_INCONSISTENT) {
     DVLOG(1) << "The property is in PROP_STATE_INCONSISTENT, "
              << "which is not supported.";
   } else if ((!is_selection_item) && (state == PROP_STATE_CHECKED)) {
     DVLOG(1) << "PROP_STATE_CHECKED is meaningful only if the type is "
              << "PROP_TYPE_RADIO.";
   } else {
     is_selection_item_checked = (state == PROP_STATE_CHECKED);
@@ skipping 18 matching lines @@
     label_to_use = (label && label->text) ? label->text : "";
   }
   if (label_to_use.empty()) {
     DVLOG(1) << "The tooltip and label are both empty. Use " << key;
     label_to_use = Or(key, "");
   }
 
   out_prop_list->push_back(InputMethodProperty(key,
                                                label_to_use,
                                                is_selection_item,
-                                               is_selection_item_checked,
-                                               selection_item_id));
+                                               is_selection_item_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(IBusProperty* ibus_prop,
                      InputMethodPropertyList* out_prop_list) {
   DCHECK(ibus_prop);
   DCHECK(out_prop_list);
 
-  int selection_item_id = -1;
-  std::stack<std::pair<IBusProperty*, int> > prop_stack;
-  prop_stack.push(std::make_pair(ibus_prop, selection_item_id));
+  const gchar* key = ibus_property_get_key(ibus_prop);
 
-  while (!prop_stack.empty()) {
-    IBusProperty* prop = prop_stack.top().first;
-    const gchar* key = ibus_property_get_key(prop);
-    const int current_selection_item_id = prop_stack.top().second;
-    prop_stack.pop();
+  // Filter out unnecessary properties.
+  if (PropertyKeyIsBlacklisted(key))
+    return true;
 
-    // Filter out unnecessary properties.
-    if (PropertyKeyIsBlacklisted(key))
-      continue;
+  // Convert |prop| to InputMethodProperty and push it to |out_prop_list|.
+  if (!ConvertProperty(ibus_prop, out_prop_list))
+    return false;
 
-    // Convert |prop| to InputMethodProperty and push it to |out_prop_list|.
-    if (!ConvertProperty(prop, current_selection_item_id, out_prop_list))
-      return false;
-
-    // Process childrens iteratively (if any). Push all sub properties to the
-    // stack.
-    if (PropertyHasChildren(prop)) {
-      ++selection_item_id;
-      for (int i = 0;; ++i) {
-        IBusProperty* sub_prop =
-            ibus_prop_list_get(ibus_property_get_sub_props(prop), i);
-        if (!sub_prop)
-          break;
-        prop_stack.push(std::make_pair(sub_prop, selection_item_id));
-      }
-      ++selection_item_id;
+  // Process childrens iteratively (if any). Push all sub properties to the
+  // stack.
+  if (PropertyHasChildren(ibus_prop)) {
+    for (int i = 0;; ++i) {
+      IBusProperty* sub_prop =
+          ibus_prop_list_get(ibus_property_get_sub_props(ibus_prop), i);
+      if (!sub_prop)
+        break;
+      if (!FlattenProperty(sub_prop, out_prop_list))
+        return false;
     }
   }
-  std::reverse(out_prop_list->begin(), out_prop_list->end());
-
   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).
 // Returns true if no error is found. The conversion to our own type is
 // necessary since our language switcher in Chrome tree don't (or can't) know
 // IBus types. Here is an example:
 //
 // ======================================================================
@@ skipping 868 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