| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 // This functionality currently works on Windows and on Linux when | 5 // This functionality currently works on Windows and on Linux when |
| 6 // toolkit_views is defined (i.e. for Chrome OS). It's not needed | 6 // toolkit_views is defined (i.e. for Chrome OS). It's not needed |
| 7 // on the Mac, and it's not yet implemented on Linux. | 7 // on the Mac, and it's not yet implemented on Linux. |
| 8 | 8 |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 #define MAYBE_TestShiftAltMenuKeyboardAccess DISABLED_TestShiftAltMenuKeyboardAc
cess | 357 #define MAYBE_TestShiftAltMenuKeyboardAccess DISABLED_TestShiftAltMenuKeyboardAc
cess |
| 358 #else | 358 #else |
| 359 #define MAYBE_TestShiftAltMenuKeyboardAccess TestShiftAltMenuKeyboardAccess | 359 #define MAYBE_TestShiftAltMenuKeyboardAccess TestShiftAltMenuKeyboardAccess |
| 360 #endif | 360 #endif |
| 361 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, | 361 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, |
| 362 MAYBE_TestShiftAltMenuKeyboardAccess) { | 362 MAYBE_TestShiftAltMenuKeyboardAccess) { |
| 363 TestMenuKeyboardAccess(true, true, false); | 363 TestMenuKeyboardAccess(true, true, false); |
| 364 } | 364 } |
| 365 | 365 |
| 366 #if defined(OS_WIN) | 366 #if defined(OS_WIN) |
| 367 // TODO(pauljensen): This used to be only for non-Aura, consider removing. | |
| 368 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, | 367 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, |
| 369 DISABLED_TestAltMenuKeyboardAccessFocusOmnibox) { | 368 DISABLED_TestAltMenuKeyboardAccessFocusOmnibox) { |
| 370 TestMenuKeyboardAccess(true, false, true); | 369 TestMenuKeyboardAccess(true, false, true); |
| 371 } | 370 } |
| 372 | 371 |
| 373 // TODO(pauljensen): This used to be only for non-Aura, consider removing. | |
| 374 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, | 372 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, |
| 375 DISABLED_TestSystemMenuWithKeyboard) { | 373 DISABLED_TestSystemMenuWithKeyboard) { |
| 376 TestSystemMenuWithKeyboard(); | 374 TestSystemMenuWithKeyboard(); |
| 377 } | 375 } |
| 378 #endif | 376 #endif |
| 379 | 377 |
| 380 #if !defined(OS_WIN) && defined(USE_AURA) | 378 #if !defined(OS_WIN) && defined(USE_AURA) |
| 381 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, TestMenuKeyboardOpenDismiss) { | 379 IN_PROC_BROWSER_TEST_F(KeyboardAccessTest, TestMenuKeyboardOpenDismiss) { |
| 382 TestMenuKeyboardAccessAndDismiss(); | 380 TestMenuKeyboardAccessAndDismiss(); |
| 383 } | 381 } |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 438 browser(), ui::VKEY_BROWSER_FORWARD, false, false, false, false)); | 436 browser(), ui::VKEY_BROWSER_FORWARD, false, false, false, false)); |
| 439 | 437 |
| 440 base::string16 after_forward; | 438 base::string16 after_forward; |
| 441 ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(), &after_forward)); | 439 ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(), &after_forward)); |
| 442 | 440 |
| 443 EXPECT_EQ(before_back, after_forward); | 441 EXPECT_EQ(before_back, after_forward); |
| 444 } | 442 } |
| 445 #endif | 443 #endif |
| 446 | 444 |
| 447 } // namespace | 445 } // namespace |
| OLD | NEW |