chrome/browser/chromeos/input_method/ refactoring [part 6 of 6]

ash/system/ime/tray_ime.cc

Index: ash/system/ime/tray_ime.cc
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc
index 29aa9c032863dc0dc49f982fc1ac947d692cf566..8f3588e98cbf9dc7af55650697cd47df38113ee1 100644
--- a/ash/system/ime/tray_ime.cc
+++ b/ash/system/ime/tray_ime.cc
@@ -4,7 +4,6 @@
 
 #include "ash/system/ime/tray_ime.h"
 
-#include <utility>
 #include <vector>
 
 #include "ash/shell.h"
@@ -123,7 +122,7 @@ class IMEDetailedView : public views::View,
           property_list[i].name,
           property_list[i].selected ? gfx::Font::BOLD : gfx::Font::NORMAL);
       properties->AddChildView(container);
-      property_map_[container] = property_list[i];
+      property_map_[container] = property_list[i].key;
     }
     properties->set_border(views::Border::CreateSolidSidedBorder(
         0, 0, 1, 0, kBorderLightColor));
@@ -154,11 +153,11 @@ class IMEDetailedView : public views::View,
         delegate->SwitchIME(ime_id);
         GetWidget()->Close();
       } else {
-        std::map<views::View*, IMEPropertyInfo>::const_iterator prop_find;
+        std::map<views::View*, std::string>::const_iterator prop_find;
         prop_find = property_map_.find(sender);
         if (prop_find != property_map_.end()) {
-          const IMEPropertyInfo& prop = prop_find->second;
-          delegate->ActivateIMEProperty(prop.key, prop.is_selection);
+          const std::string key = prop_find->second;
+          delegate->ActivateIMEProperty(key);
           GetWidget()->Close();
         }
       }
@@ -168,7 +167,7 @@ class IMEDetailedView : public views::View,
   user::LoginStatus login_;
 
   std::map<views::View*, std::string> ime_map_;
-  std::map<views::View*, IMEPropertyInfo> property_map_;
+  std::map<views::View*, std::string> property_map_;
   views::View* header_;
   views::View* settings_;