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

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

Issue 2469663002: [ash-md] Add on-screen keyboard toggle row in IME menu view. (Closed)
Patch Set: Remove use of SetMaximumWidth(). Created 4 years, 1 month 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/chromeos/ime_menu/ime_list_view.cc ('k') | ash/resources/vector_icons/BUILD.gn » ('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 649d18c97f021b7ffe8b1e2dbc92da4d9ff82a98..b71f2f0508a5cf7cb3fa1061fb41350538a46ece 100644
--- a/ash/common/system/ime/tray_ime_chromeos_unittest.cc
+++ b/ash/common/system/ime/tray_ime_chromeos_unittest.cc
@@ -133,6 +133,9 @@ void TrayIMETest::TearDown() {
// Tests that if the keyboard is not suppressed the default view is hidden
// if less than 2 IMEs are present.
TEST_F(TrayIMETest, HiddenWithNoIMEs) {
+ if (MaterialDesignController::IsSystemTrayMenuMaterial())
+ return;
+
SetIMELength(0);
EXPECT_FALSE(default_view()->visible());
SetIMELength(1);
@@ -144,6 +147,9 @@ TEST_F(TrayIMETest, HiddenWithNoIMEs) {
// Tests that if no IMEs are present the default view is hidden when a11y is
// enabled.
TEST_F(TrayIMETest, HidesOnA11yEnabled) {
+ if (MaterialDesignController::IsSystemTrayMenuMaterial())
+ return;
+
SetIMELength(0);
SuppressKeyboard();
EXPECT_TRUE(default_view()->visible());
@@ -158,6 +164,9 @@ TEST_F(TrayIMETest, HidesOnA11yEnabled) {
// Tests that clicking on the keyboard toggle causes the virtual keyboard
// to toggle between enabled and disabled.
TEST_F(TrayIMETest, PerformActionOnDetailedView) {
+ if (MaterialDesignController::IsSystemTrayMenuMaterial())
+ return;
+
SetIMELength(0);
SuppressKeyboard();
EXPECT_FALSE(keyboard::IsKeyboardEnabled());
« no previous file with comments | « ash/common/system/chromeos/ime_menu/ime_list_view.cc ('k') | ash/resources/vector_icons/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698