| Index: ash/system/ime/tray_ime_chromeos.cc
|
| diff --git a/ash/system/ime/tray_ime_chromeos.cc b/ash/system/ime/tray_ime_chromeos.cc
|
| index 85165a6752453521867557783ca8cb29d94ec4aa..537a4f1db48feed3c4c7e0b98b2d5596a50cbac1 100644
|
| --- a/ash/system/ime/tray_ime_chromeos.cc
|
| +++ b/ash/system/ime/tray_ime_chromeos.cc
|
| @@ -11,9 +11,9 @@
|
| #include "ash/shell.h"
|
| #include "ash/shell_port.h"
|
| #include "ash/strings/grit/ash_strings.h"
|
| +#include "ash/system/ime/ime_util.h"
|
| #include "ash/system/tray/system_tray.h"
|
| #include "ash/system/tray/system_tray_controller.h"
|
| -#include "ash/system/tray/system_tray_delegate.h"
|
| #include "ash/system/tray/system_tray_notifier.h"
|
| #include "ash/system/tray/tray_constants.h"
|
| #include "ash/system/tray/tray_details_view.h"
|
| @@ -215,8 +215,7 @@ bool TrayIME::ShouldShowKeyboardToggle() {
|
|
|
| base::string16 TrayIME::GetDefaultViewLabel(bool show_ime_label) {
|
| if (show_ime_label) {
|
| - IMEInfo current;
|
| - Shell::Get()->system_tray_delegate()->GetCurrentIME(¤t);
|
| + IMEInfo current = ime_util::GetCurrentIME();
|
| return current.name;
|
| } else {
|
| // Display virtual keyboard status instead.
|
| @@ -268,12 +267,9 @@ void TrayIME::DestroyDetailedView() {
|
|
|
| void TrayIME::OnIMERefresh() {
|
| // Caches the current ime state.
|
| - SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
|
| - ime_list_.clear();
|
| - property_list_.clear();
|
| - delegate->GetCurrentIME(¤t_ime_);
|
| - delegate->GetAvailableIMEList(&ime_list_);
|
| - delegate->GetCurrentIMEProperties(&property_list_);
|
| + current_ime_ = ime_util::GetCurrentIME();
|
| + ime_list_ = ime_util::GetAvailableIMEList();
|
| + property_list_ = ime_util::GetCurrentIMEProperties();
|
| auto ime_state = InputMethodManager::Get()->GetActiveIMEState();
|
| ime_managed_message_ =
|
| ime_state->GetAllowedInputMethods().empty()
|
|
|