| Index: ash/common/system/ime/tray_ime_chromeos.cc
|
| diff --git a/ash/common/system/ime/tray_ime_chromeos.cc b/ash/common/system/ime/tray_ime_chromeos.cc
|
| index 8b2dca551d5fae56f6e67a014893950718b567f5..484ad9c04f04828e621b652c0b4263a70ea18a93 100644
|
| --- a/ash/common/system/ime/tray_ime_chromeos.cc
|
| +++ b/ash/common/system/ime/tray_ime_chromeos.cc
|
| @@ -25,6 +25,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 "base/logging.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| @@ -274,8 +275,9 @@ void TrayIME::UpdateTrayLabel(const IMEInfo& current, size_t count) {
|
| }
|
|
|
| bool TrayIME::ShouldShowKeyboardToggle() {
|
| - return keyboard_suppressed_ &&
|
| - !WmShell::Get()->accessibility_delegate()->IsVirtualKeyboardEnabled();
|
| + return keyboard_suppressed_ && !Shell::GetInstance()
|
| + ->accessibility_delegate()
|
| + ->IsVirtualKeyboardEnabled();
|
| }
|
|
|
| base::string16 TrayIME::GetDefaultViewLabel(bool show_ime_label) {
|
|
|