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

Unified Diff: ash/test/ash_test_base.cc

Issue 2739703003: Last sets of tests that can move to common_unittests (Closed)
Patch Set: comments 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/mus/window_manager_unittest.cc ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 3da727ac4ffd77821867c1dc5b56ce714eaf9f05..27f39cf092827eb16c635e78ec36c843ebb672f8 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -358,6 +358,11 @@ void AshTestBase::UnblockUserSession() {
}
void AshTestBase::DisableIME() {
+ // WindowTreeHostManager isn't applicable to mash and IME is routed
+ // differently in mash.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
Shell::GetInstance()->RemovePreTargetHandler(
Shell::GetInstance()
->window_tree_host_manager()
« no previous file with comments | « ash/mus/window_manager_unittest.cc ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698