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

chrome/browser/chromeos/system/ash_system_tray_delegate.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/system/ash_system_tray_delegate.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/audio_observer.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
@@ skipping 358 matching lines @@
     input_method::InputMethodManager* manager =
         input_method::InputMethodManager::GetInstance();
     input_method::InputMethodUtil* util = manager->GetInputMethodUtil();
     input_method::InputMethodPropertyList properties =
         manager->GetCurrentInputMethodProperties();
     for (size_t i = 0; i < properties.size(); ++i) {
       ash::IMEPropertyInfo property;
       property.key = properties[i].key;
       property.name = util->TranslateString(properties[i].label);
       property.selected = properties[i].is_selection_item_checked;
-      property.is_selection = properties[i].is_selection_item;
       list->push_back(property);
     }
   }
 
   virtual void SwitchIME(const std::string& ime_id) OVERRIDE {
     input_method::InputMethodManager::GetInstance()->ChangeInputMethod(ime_id);
   }
 
-  virtual void ActivateIMEProperty(
-      const std::string& key, bool is_selection) OVERRIDE {
-    input_method::InputMethodManager::GetInstance()->SetImePropertyActivated(
-        key, is_selection);
+  virtual void ActivateIMEProperty(const std::string& key) OVERRIDE {
+    input_method::InputMethodManager::GetInstance()->
+        ActivateInputMethodProperty(key);
   }
 
   virtual void GetMostRelevantNetworkIcon(ash::NetworkIconInfo* info,
                                           bool dark) OVERRIDE {
     NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
     info->image = !dark ? network_icon_->GetIconAndText(&info->description) :
         network_icon_dark_->GetIconAndText(&info->description);
     info->tray_icon_visible =
         ShouldShowNetworkIconInTray(crosnet->connected_network());
   }
@@ skipping 421 matching lines @@
         SetProfile(ProfileManager::GetDefaultProfile());
         break;
       }
       default:
         NOTREACHED();
     }
   }
 
   // Overridden from InputMethodManager::Observer.
   virtual void InputMethodChanged(
-      input_method::InputMethodManager* manager,
-      const input_method::InputMethodDescriptor& current_method,
-      size_t num_active_input_methods) OVERRIDE {
+      input_method::InputMethodManager* manager) OVERRIDE {
     NotifyRefreshIME();
   }
 
-  virtual void ActiveInputMethodsChanged(
-      input_method::InputMethodManager* manager,
-      const input_method::InputMethodDescriptor& current_input_method,
-      size_t num_active_input_methods) OVERRIDE {
+  virtual void InputMethodPropertyChanged(
+      input_method::InputMethodManager* manager) OVERRIDE {
     NotifyRefreshIME();
   }
 
-  virtual void PropertyListChanged(
-      input_method::InputMethodManager* manager,
-      const input_method::InputMethodPropertyList& properties) OVERRIDE {
-    NotifyRefreshIME();
-  }
-
   // Overridden from system::TimezoneSettings::Observer.
   virtual void TimezoneChanged(const icu::TimeZone& timezone) OVERRIDE {
     NotifyRefreshClock();
   }
 
   // Overridden from BluetoothAdapter::Observer.
   virtual void AdapterPresentChanged(BluetoothAdapter* adapter,
                                      bool present) OVERRIDE {
     NotifyRefreshBluetooth();
   }
@@ skipping 93 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
   return new chromeos::SystemTrayDelegate(tray);
 }
 
 }  // namespace chromeos