Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Unified Diff: ash/common/system/ime/tray_ime_chromeos_unittest.cc

Issue 2738133003: Promotes a handful of members from WmShell to Shell (Closed)
Patch Set: merge Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/ime/tray_ime_chromeos.cc ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/ime/tray_ime_chromeos_unittest.cc
diff --git a/ash/common/system/ime/tray_ime_chromeos_unittest.cc b/ash/common/system/ime/tray_ime_chromeos_unittest.cc
index fb6e8bc05f09ed54a888247d8b74d32e8630a725..7db95ae169ee8947bb99e59f5b129704c9a25ce7 100644
--- a/ash/common/system/ime/tray_ime_chromeos_unittest.cc
+++ b/ash/common/system/ime/tray_ime_chromeos_unittest.cc
@@ -9,6 +9,7 @@
#include "ash/common/system/chromeos/ime_menu/ime_list_view.h"
#include "ash/common/system/tray/system_tray_notifier.h"
#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/events/devices/device_data_manager.h"
@@ -59,7 +60,8 @@ class TrayIMETest : public test::AshTestBase {
};
void TrayIMETest::SetAccessibilityKeyboardEnabled(bool enabled) {
- WmShell::Get()->accessibility_delegate()->SetVirtualKeyboardEnabled(enabled);
+ Shell::GetInstance()->accessibility_delegate()->SetVirtualKeyboardEnabled(
+ enabled);
keyboard::SetAccessibilityKeyboardEnabled(enabled);
AccessibilityNotificationVisibility notification =
enabled ? A11Y_NOTIFICATION_SHOW : A11Y_NOTIFICATION_NONE;
« no previous file with comments | « ash/common/system/ime/tray_ime_chromeos.cc ('k') | ash/common/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698