OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "apps/shell_window.h" | 5 #include "apps/shell_window.h" |
6 #include "apps/shell_window_registry.h" | 6 #include "apps/shell_window_registry.h" |
7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
10 #include "chrome/browser/extensions/extension_test_message_listener.h" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
469 ASSERT_TRUE(ui_test_utils::SendMouseMoveSync( | 469 ASSERT_TRUE(ui_test_utils::SendMouseMoveSync( |
470 gfx::Point(corner().x() + 51, corner().y() + 11))); | 470 gfx::Point(corner().x() + 51, corner().y() + 11))); |
471 ASSERT_TRUE(move_listener2.WaitUntilSatisfied()); | 471 ASSERT_TRUE(move_listener2.WaitUntilSatisfied()); |
472 } | 472 } |
473 } | 473 } |
474 | 474 |
475 #endif // (defined(OS_WIN) || defined(OS_LINUX)) | 475 #endif // (defined(OS_WIN) || defined(OS_LINUX)) |
476 | 476 |
477 // Fails on Windows. crbug.com/236040 | 477 // Fails on Windows. crbug.com/236040 |
478 // Also flaky on ChromiumOS. crbug.com/281815 | 478 // Also flaky on ChromiumOS. crbug.com/281815 |
479 #if defined(OS_WIN) || defined(OS_CHROMEOS) | 479 // Appears to be flaky on Mac and Linux too. |
480 #define MAYBE_Focus DISABLED_Focus | 480 #define MAYBE_Focus DISABLED_Focus |
lazyboy
2013/08/30 22:03:47
nit: Can get of this #define and directly call th
| |
481 #else | |
482 #define MAYBE_Focus Focus | |
483 #endif | |
484 // Tests that setting focus on the <webview> sets focus on the guest. | 481 // Tests that setting focus on the <webview> sets focus on the guest. |
485 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, MAYBE_Focus) { | 482 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, MAYBE_Focus) { |
486 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. | 483 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. |
487 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/focus")) | 484 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/focus")) |
488 << message_; | 485 << message_; |
489 } | 486 } |
490 | 487 |
491 // Tests that guests receive edit commands and respond appropriately. | 488 // Tests that guests receive edit commands and respond appropriately. |
492 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, EditCommands) { | 489 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, EditCommands) { |
493 SetupTest("web_view/edit_commands", | 490 SetupTest("web_view/edit_commands", |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
685 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); | 682 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); |
686 } | 683 } |
687 | 684 |
688 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, | 685 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, |
689 PointerLock_PointerLockLostWithFocus) { | 686 PointerLock_PointerLockLostWithFocus) { |
690 TestHelper("testPointerLockLostWithFocus", | 687 TestHelper("testPointerLockLostWithFocus", |
691 "DonePointerLockTest.PASSED", | 688 "DonePointerLockTest.PASSED", |
692 "DonePointerLockTest.FAILED", | 689 "DonePointerLockTest.FAILED", |
693 "web_view/pointerlock"); | 690 "web_view/pointerlock"); |
694 } | 691 } |
OLD | NEW |