| Index: ash/system/ime_menu/ime_list_view.cc
|
| diff --git a/ash/system/ime_menu/ime_list_view.cc b/ash/system/ime_menu/ime_list_view.cc
|
| index d93455aca0523004442c0005d2fef19e3f1a5e78..7fb46f1e769a698a5142f800c609c78ab239a5cc 100644
|
| --- a/ash/system/ime_menu/ime_list_view.cc
|
| +++ b/ash/system/ime_menu/ime_list_view.cc
|
| @@ -10,10 +10,10 @@
|
| #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/actionable_view.h"
|
| #include "ash/system/tray/ime_info.h"
|
| #include "ash/system/tray/system_menu_button.h"
|
| -#include "ash/system/tray/system_tray_delegate.h"
|
| #include "ash/system/tray/tray_constants.h"
|
| #include "ash/system/tray/tray_details_view.h"
|
| #include "ash/system/tray/tray_popup_header_button.h"
|
| @@ -196,11 +196,8 @@ ImeListView::~ImeListView() {}
|
|
|
| void ImeListView::Init(bool show_keyboard_toggle,
|
| SingleImeBehavior single_ime_behavior) {
|
| - SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
|
| - IMEInfoList list;
|
| - delegate->GetAvailableIMEList(&list);
|
| - IMEPropertyInfoList property_list;
|
| - delegate->GetCurrentIMEProperties(&property_list);
|
| + IMEInfoList list = ime_util::GetAvailableIMEList();
|
| + IMEPropertyInfoList property_list = ime_util::GetCurrentIMEProperties();
|
| Update(list, property_list, show_keyboard_toggle, single_ime_behavior);
|
| }
|
|
|
|
|