| 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/accelerators/accelerator_controller.h" | 7 #include "ash/accelerators/accelerator_controller.h" |
| 8 #include "ash/accelerators/accelerator_table.h" | 8 #include "ash/accelerators/accelerator_table.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/system/tray/system_tray.h" | 10 #include "ash/system/tray/system_tray.h" |
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 SendKeyPress(ui::VKEY_TAB); | 357 SendKeyPress(ui::VKEY_TAB); |
| 358 std::string utterance = speech_monitor_.GetNextUtterance(); | 358 std::string utterance = speech_monitor_.GetNextUtterance(); |
| 359 if (MatchPattern(utterance, "Previous menu Button")) | 359 if (MatchPattern(utterance, "Previous menu Button")) |
| 360 break; | 360 break; |
| 361 } | 361 } |
| 362 SendKeyPress(ui::VKEY_RETURN); | 362 SendKeyPress(ui::VKEY_RETURN); |
| 363 EXPECT_TRUE( | 363 EXPECT_TRUE( |
| 364 MatchPattern(speech_monitor_.GetNextUtterance(), "*Bluetooth* Button")); | 364 MatchPattern(speech_monitor_.GetNextUtterance(), "*Bluetooth* Button")); |
| 365 } | 365 } |
| 366 | 366 |
| 367 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, ScreenBrightness) { | 367 // See http://crbug.com/443608 |
| 368 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, DISABLED_ScreenBrightness) { |
| 368 EnableChromeVox(); | 369 EnableChromeVox(); |
| 369 | 370 |
| 370 EXPECT_TRUE(PerformAcceleratorAction(ash::BRIGHTNESS_UP)); | 371 EXPECT_TRUE(PerformAcceleratorAction(ash::BRIGHTNESS_UP)); |
| 371 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), | 372 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), |
| 372 "Brightness * percent")); | 373 "Brightness * percent")); |
| 373 | 374 |
| 374 EXPECT_TRUE(PerformAcceleratorAction(ash::BRIGHTNESS_DOWN)); | 375 EXPECT_TRUE(PerformAcceleratorAction(ash::BRIGHTNESS_DOWN)); |
| 375 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), | 376 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), |
| 376 "Brightness * percent")); | 377 "Brightness * percent")); |
| 377 } | 378 } |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 593 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance()); | 594 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance()); |
| 594 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), | 595 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), |
| 595 "Combo box * of *")); | 596 "Combo box * of *")); |
| 596 ASSERT_TRUE( | 597 ASSERT_TRUE( |
| 597 ui_test_utils::SendKeyPressToWindowSync( | 598 ui_test_utils::SendKeyPressToWindowSync( |
| 598 window, ui::VKEY_TAB, false, false, false, false)); | 599 window, ui::VKEY_TAB, false, false, false, false)); |
| 599 EXPECT_EQ("Select your keyboard:", speech_monitor_.GetNextUtterance()); | 600 EXPECT_EQ("Select your keyboard:", speech_monitor_.GetNextUtterance()); |
| 600 } | 601 } |
| 601 | 602 |
| 602 } // namespace chromeos | 603 } // namespace chromeos |
| OLD | NEW |