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

ash/system/ime/tray_ime.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 "ash/system/ime/tray_ime.h"
 
 #include <utility>

[Jun Mukai, 2012/04/17 03:55:05]

oh, I introduced this by mistake but nobody seems using.  Please remove it too.

[Yusuke Sato, 2012/04/17 04:33:32]

Done.

 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 133 matching lines @@
       ime_find = ime_map_.find(sender);
       if (ime_find != ime_map_.end()) {
         std::string ime_id = ime_find->second;
         delegate->SwitchIME(ime_id);
         GetWidget()->Close();
       } else {
         std::map<views::View*, IMEPropertyInfo>::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);
+          delegate->ActivateIMEProperty(prop.key);
           GetWidget()->Close();
         }
       }
     }
   }
 
   user::LoginStatus login_;
 
   std::map<views::View*, std::string> ime_map_;
   std::map<views::View*, IMEPropertyInfo> property_map_;

[Jun Mukai, 2012/04/17 03:55:05]

Then you can switch here back to std::string (just store key itself only).
Please revert crrev.com/131583 itself.

[Yusuke Sato, 2012/04/17 04:33:32]

Done.

   views::View* header_;
   views::View* settings_;
 
   DISALLOW_COPY_AND_ASSIGN(IMEDetailedView);
 };
 
 }  // namespace tray
 
 TrayIME::TrayIME() {
 }
@@ skipping 48 matching lines @@
   UpdateTrayLabel(current, list.size());
 
   if (default_.get())
     default_->UpdateLabel(current);
   if (detailed_.get())
     detailed_->Update(list, property_list);
 }
 
 }  // namespace internal
 }  // namespace ash