OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/system/ime/tray_ime_chromeos.h" | 5 #include "ash/system/ime/tray_ime_chromeos.h" |
6 | 6 |
7 #include "ash/common/accessibility_delegate.h" | 7 #include "ash/common/accessibility_delegate.h" |
8 #include "ash/common/accessibility_types.h" | 8 #include "ash/common/accessibility_types.h" |
| 9 #include "ash/common/system/tray/tray_details_view.h" |
9 #include "ash/common/system/tray/wm_system_tray_notifier.h" | 10 #include "ash/common/system/tray/wm_system_tray_notifier.h" |
10 #include "ash/common/wm_shell.h" | 11 #include "ash/common/wm_shell.h" |
11 #include "ash/system/status_area_widget.h" | 12 #include "ash/system/status_area_widget.h" |
12 #include "ash/system/tray/tray_details_view.h" | |
13 #include "ash/test/ash_test_base.h" | 13 #include "ash/test/ash_test_base.h" |
14 #include "ash/test/status_area_widget_test_helper.h" | 14 #include "ash/test/status_area_widget_test_helper.h" |
15 #include "ash/test/virtual_keyboard_test_helper.h" | 15 #include "ash/test/virtual_keyboard_test_helper.h" |
16 #include "base/command_line.h" | 16 #include "base/command_line.h" |
17 #include "ui/keyboard/keyboard_util.h" | 17 #include "ui/keyboard/keyboard_util.h" |
18 | 18 |
19 namespace ash { | 19 namespace ash { |
20 | 20 |
21 class TrayIMETest : public test::AshTestBase { | 21 class TrayIMETest : public test::AshTestBase { |
22 public: | 22 public: |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 toggle = GetScrollChildView(0); | 153 toggle = GetScrollChildView(0); |
154 // Clicking again should disable the keyboard. | 154 // Clicking again should disable the keyboard. |
155 tap = ui::GestureEvent(0, 0, 0, base::TimeTicks(), | 155 tap = ui::GestureEvent(0, 0, 0, base::TimeTicks(), |
156 ui::GestureEventDetails(ui::ET_GESTURE_TAP)); | 156 ui::GestureEventDetails(ui::ET_GESTURE_TAP)); |
157 toggle->OnGestureEvent(&tap); | 157 toggle->OnGestureEvent(&tap); |
158 EXPECT_FALSE(keyboard::IsKeyboardEnabled()); | 158 EXPECT_FALSE(keyboard::IsKeyboardEnabled()); |
159 EXPECT_TRUE(default_view()->visible()); | 159 EXPECT_TRUE(default_view()->visible()); |
160 } | 160 } |
161 | 161 |
162 } // namespace ash | 162 } // namespace ash |
OLD | NEW |