| 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 <queue> | 5 #include <queue> |
| 6 | 6 |
| 7 #include "ash/common/accelerators/accelerator_controller.h" | 7 #include "ash/common/accelerators/accelerator_controller.h" |
| 8 #include "ash/common/accelerators/accelerator_table.h" | 8 #include "ash/common/accelerators/accelerator_table.h" |
| 9 #include "ash/common/accessibility_types.h" | 9 #include "ash/common/accessibility_types.h" |
| 10 #include "ash/common/system/tray/system_tray.h" | 10 #include "ash/common/system/tray/system_tray.h" |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 EXPECT_EQ("z", speech_monitor_.GetNextUtterance()); | 337 EXPECT_EQ("z", speech_monitor_.GetNextUtterance()); |
| 338 | 338 |
| 339 SendKeyPress(ui::VKEY_BACK); | 339 SendKeyPress(ui::VKEY_BACK); |
| 340 EXPECT_EQ("z", speech_monitor_.GetNextUtterance()); | 340 EXPECT_EQ("z", speech_monitor_.GetNextUtterance()); |
| 341 } | 341 } |
| 342 | 342 |
| 343 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, FocusShelf) { | 343 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, FocusShelf) { |
| 344 EnableChromeVox(); | 344 EnableChromeVox(); |
| 345 | 345 |
| 346 EXPECT_TRUE(PerformAcceleratorAction(ash::FOCUS_SHELF)); | 346 EXPECT_TRUE(PerformAcceleratorAction(ash::FOCUS_SHELF)); |
| 347 if (app_list::switches::IsExperimentalAppListEnabled()) | 347 EXPECT_EQ("Launcher", speech_monitor_.GetNextUtterance()); |
| 348 EXPECT_EQ("Launcher", speech_monitor_.GetNextUtterance()); | |
| 349 else | |
| 350 EXPECT_EQ("Apps", speech_monitor_.GetNextUtterance()); | |
| 351 EXPECT_EQ("Button", speech_monitor_.GetNextUtterance()); | 348 EXPECT_EQ("Button", speech_monitor_.GetNextUtterance()); |
| 352 | 349 |
| 353 EXPECT_EQ("Shelf", speech_monitor_.GetNextUtterance()); | 350 EXPECT_EQ("Shelf", speech_monitor_.GetNextUtterance()); |
| 354 EXPECT_EQ("Tool bar", speech_monitor_.GetNextUtterance()); | 351 EXPECT_EQ("Tool bar", speech_monitor_.GetNextUtterance()); |
| 355 EXPECT_EQ(", window", speech_monitor_.GetNextUtterance()); | 352 EXPECT_EQ(", window", speech_monitor_.GetNextUtterance()); |
| 356 | 353 |
| 357 SendKeyPress(ui::VKEY_TAB); | 354 SendKeyPress(ui::VKEY_TAB); |
| 358 EXPECT_TRUE(base::MatchPattern(speech_monitor_.GetNextUtterance(), "*")); | 355 EXPECT_TRUE(base::MatchPattern(speech_monitor_.GetNextUtterance(), "*")); |
| 359 EXPECT_TRUE(base::MatchPattern(speech_monitor_.GetNextUtterance(), "Button")); | 356 EXPECT_TRUE(base::MatchPattern(speech_monitor_.GetNextUtterance(), "Button")); |
| 360 } | 357 } |
| (...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 788 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync( | 785 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync( |
| 789 window, ui::VKEY_TAB, false, true /*shift*/, false, false)); | 786 window, ui::VKEY_TAB, false, true /*shift*/, false, false)); |
| 790 while (speech_monitor_.GetNextUtterance() != "Select your language:") { | 787 while (speech_monitor_.GetNextUtterance() != "Select your language:") { |
| 791 } | 788 } |
| 792 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance()); | 789 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance()); |
| 793 EXPECT_TRUE(base::MatchPattern(speech_monitor_.GetNextUtterance(), | 790 EXPECT_TRUE(base::MatchPattern(speech_monitor_.GetNextUtterance(), |
| 794 "Combo box * of *")); | 791 "Combo box * of *")); |
| 795 } | 792 } |
| 796 | 793 |
| 797 } // namespace chromeos | 794 } // namespace chromeos |
| OLD | NEW |