[ash-md] Add on-screen keyboard toggle row in IME menu view.

ash/common/system/ime/tray_ime_chromeos_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/ime/tray_ime_chromeos.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_details_view.h"
@@ skipping 115 matching lines @@
   SetAccessibilityKeyboardEnabled(false);
   tray_.reset();
   default_view_.reset();
   detailed_view_.reset();
   test::AshTestBase::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);
   EXPECT_FALSE(default_view()->visible());
   SetIMELength(2);
   EXPECT_TRUE(default_view()->visible());
 }
 
 // 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());
   // Enable a11y keyboard.
   SetAccessibilityKeyboardEnabled(true);
   EXPECT_FALSE(default_view()->visible());
   // Disable the a11y keyboard.
   SetAccessibilityKeyboardEnabled(false);
   EXPECT_TRUE(default_view()->visible());
 }
 
 // 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());
   views::View* toggle = GetScrollChildView(0);
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   // Enable the keyboard.
   toggle->OnGestureEvent(&tap);
   EXPECT_TRUE(keyboard::IsKeyboardEnabled());
   EXPECT_TRUE(default_view()->visible());
   // With no IMEs the toggle should be the first child.
   toggle = GetScrollChildView(0);
   // Clicking again should disable the keyboard.
   tap = ui::GestureEvent(0, 0, 0, base::TimeTicks(),
                          ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   toggle->OnGestureEvent(&tap);
   EXPECT_FALSE(keyboard::IsKeyboardEnabled());
   EXPECT_TRUE(default_view()->visible());
 }
 
 }  // namespace ash