Allow non-radio button properties in uber tray. Simplified chinese will use it.

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>
 #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 98 matching lines @@
     property_map_.clear();
     views::View* properties = new views::View;
     properties->SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kVertical, 0, 0, 1));
     for (size_t i = 0; i < property_list.size(); i++) {
       HoverHighlightView* container = new HoverHighlightView(this);
       container->AddLabel(
           property_list[i].name,
           property_list[i].selected ? gfx::Font::BOLD : gfx::Font::NORMAL);
       properties->AddChildView(container);
-      property_map_[container] = property_list[i].key;
+      property_map_[container] =
+          std::make_pair(property_list[i].key, property_list[i].is_selection);
     }
     properties->set_border(views::Border::CreateSolidSidedBorder(
         0, 0, 1, 0, kBorderLightColor));
     AddChildView(properties);
   }
 
   void AppendSettings() {
     HoverHighlightView* container = new HoverHighlightView(this);
     container->AddLabel(ui::ResourceBundle::GetSharedInstance().
         GetLocalizedString(IDS_ASH_STATUS_TRAY_IME_SETTINGS),
@@ skipping 10 matching lines @@
     } else if (sender == settings_) {
       delegate->ShowIMESettings();
     } else {
       std::map<views::View*, std::string>::const_iterator ime_find;
       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*, std::string>::const_iterator prop_find;
-        prop_find = property_map_.find(sender);
+        std::map<views::View*, std::pair<std::string, bool> >::const_iterator
+            prop_find = property_map_.find(sender);
         if (prop_find != property_map_.end()) {
-          std::string key = prop_find->second;
-          delegate->ActivateIMEProperty(key);
+          const std::pair<std::string, bool>& prop = prop_find->second;
+          delegate->ActivateIMEProperty(prop.first, prop.second);
           GetWidget()->Close();
         }
       }
     }
   }
 
   user::LoginStatus login_;
 
   std::map<views::View*, std::string> ime_map_;
-  std::map<views::View*, std::string> property_map_;
+  std::map<views::View*, std::pair<std::string, bool> > property_map_;

[sky, 2012/04/09 15:18:56]

Document what the pair is.

[Jun Mukai, 2012/04/10 02:13:46]

Use IMEPropertyInfo struct instead.

   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