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

Unified Diff: ash/common/system/chromeos/ime_menu/ime_menu_tray_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
Index: ash/common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc
diff --git a/ash/common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc b/ash/common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc
index a7ebfc313d4d25849c2d40e5f5b9ee10d0c16aef..c5a5923985c87646150bd92260a0d24707569438 100644
--- a/ash/common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc
+++ b/ash/common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc
@@ -12,6 +12,7 @@
#include "ash/common/system/tray/system_tray_notifier.h"
#include "ash/common/test/test_system_tray_delegate.h"
#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/status_area_widget_test_helper.h"
#include "base/strings/utf_string_conversions.h"
@@ -259,7 +260,7 @@ TEST_F(ImeMenuTrayTest, ShowEmojiKeyset) {
EXPECT_TRUE(IsBubbleShown());
AccessibilityDelegate* accessibility_delegate =
- WmShell::Get()->accessibility_delegate();
+ Shell::GetInstance()->accessibility_delegate();
accessibility_delegate->SetVirtualKeyboardEnabled(true);
EXPECT_TRUE(accessibility_delegate->IsVirtualKeyboardEnabled());
@@ -278,7 +279,7 @@ TEST_F(ImeMenuTrayTest, ShowEmojiKeyset) {
TEST_F(ImeMenuTrayTest, ForceToShowEmojiKeyset) {
AccessibilityDelegate* accessibility_delegate =
- WmShell::Get()->accessibility_delegate();
+ Shell::GetInstance()->accessibility_delegate();
accessibility_delegate->SetVirtualKeyboardEnabled(false);
ASSERT_FALSE(accessibility_delegate->IsVirtualKeyboardEnabled());
« no previous file with comments | « ash/common/system/chromeos/ime_menu/ime_menu_tray.cc ('k') | ash/common/system/chromeos/palette/palette_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698