| Index: ash/common/system/chromeos/ime_menu/ime_list_view.cc
|
| diff --git a/ash/common/system/chromeos/ime_menu/ime_list_view.cc b/ash/common/system/chromeos/ime_menu/ime_list_view.cc
|
| index 64795582d8f8f8d81b1dff507146178a77cb4280..45383d1f109233b6a1eb0739945c4e427c962ded 100644
|
| --- a/ash/common/system/chromeos/ime_menu/ime_list_view.cc
|
| +++ b/ash/common/system/chromeos/ime_menu/ime_list_view.cc
|
| @@ -18,6 +18,7 @@
|
| #include "ash/common/wm_shell.h"
|
| #include "ash/resources/grit/ash_resources.h"
|
| #include "ash/resources/vector_icons/vector_icons.h"
|
| +#include "ash/shell.h"
|
| #include "ash/strings/grit/ash_strings.h"
|
| #include "ui/accessibility/ax_node_data.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| @@ -238,7 +239,7 @@ ImeListView::~ImeListView() {}
|
|
|
| void ImeListView::Init(bool show_keyboard_toggle,
|
| SingleImeBehavior single_ime_behavior) {
|
| - SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
|
| + SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
|
| IMEInfoList list;
|
| delegate->GetAvailableIMEList(&list);
|
| IMEPropertyInfoList property_list;
|
| @@ -394,7 +395,7 @@ void ImeListView::HandleViewClicked(views::View* view) {
|
| return;
|
| }
|
|
|
| - SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
|
| + SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
|
| std::map<views::View*, std::string>::const_iterator ime = ime_map_.find(view);
|
| if (ime != ime_map_.end()) {
|
| WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_IME_SWITCH_MODE);
|
|
|