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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/test/ash_test_base.cc

Issue 2739703003: Last sets of tests that can move to common_unittests (Closed)
Patch Set: 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
« ash/mus/window_manager_unittest.cc ('K') | « ash/mus/window_manager_unittest.cc ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | ash/wm/overview/window_selector_unittest.cc » ('J')
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..c5a819f81b09f4a4a1a68793527deb16762bda8a 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -358,6 +358,10 @@ void AshTestBase::UnblockUserSession() {
}
void AshTestBase::DisableIME() {
+ // The functionality done here doesn't make sense in mash.
msw 2017/03/07 21:36:01 nit: elaborate on this comment, cite a bug?
sky 2017/03/07 21:43:30 There is no bug, but I expanded the comment.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
Shell::GetInstance()->RemovePreTargetHandler(
Shell::GetInstance()
->window_tree_host_manager()
« ash/mus/window_manager_unittest.cc ('K') | « ash/mus/window_manager_unittest.cc ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | ash/wm/overview/window_selector_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698