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/ui/native_app_window.h" | 5 #include "apps/ui/native_app_window.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.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/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
10 #include "chrome/browser/apps/app_browsertest_util.h" | 10 #include "chrome/browser/apps/app_browsertest_util.h" |
(...skipping 1670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1681 } | 1681 } |
1682 | 1682 |
1683 // Checks that window.screenX/screenY/screenLeft/screenTop works correctly for | 1683 // Checks that window.screenX/screenY/screenLeft/screenTop works correctly for |
1684 // guests. | 1684 // guests. |
1685 IN_PROC_BROWSER_TEST_F(WebViewTest, ScreenCoordinates) { | 1685 IN_PROC_BROWSER_TEST_F(WebViewTest, ScreenCoordinates) { |
1686 ASSERT_TRUE(RunPlatformAppTestWithArg( | 1686 ASSERT_TRUE(RunPlatformAppTestWithArg( |
1687 "platform_apps/web_view/common", "screen_coordinates")) | 1687 "platform_apps/web_view/common", "screen_coordinates")) |
1688 << message_; | 1688 << message_; |
1689 } | 1689 } |
1690 | 1690 |
1691 IN_PROC_BROWSER_TEST_F(WebViewTest, SpeechRecognition) { | 1691 // crbug/360448 |
| 1692 IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_SpeechRecognition) { |
1692 ASSERT_TRUE(StartEmbeddedTestServer()); | 1693 ASSERT_TRUE(StartEmbeddedTestServer()); |
1693 content::WebContents* guest_web_contents = LoadGuest( | 1694 content::WebContents* guest_web_contents = LoadGuest( |
1694 "/extensions/platform_apps/web_view/speech/guest.html", | 1695 "/extensions/platform_apps/web_view/speech/guest.html", |
1695 "web_view/speech"); | 1696 "web_view/speech"); |
1696 ASSERT_TRUE(guest_web_contents); | 1697 ASSERT_TRUE(guest_web_contents); |
1697 | 1698 |
1698 // Click on the guest (center of the WebContents), the guest is rendered in a | 1699 // Click on the guest (center of the WebContents), the guest is rendered in a |
1699 // way that this will trigger clicking on speech recognition input mic. | 1700 // way that this will trigger clicking on speech recognition input mic. |
1700 SimulateMouseClick(guest_web_contents, 0, blink::WebMouseEvent::ButtonLeft); | 1701 SimulateMouseClick(guest_web_contents, 0, blink::WebMouseEvent::ButtonLeft); |
1701 | 1702 |
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2046 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor, | 2047 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor, |
2047 WebViewCaptureTest, | 2048 WebViewCaptureTest, |
2048 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); | 2049 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); |
2049 #endif | 2050 #endif |
2050 | 2051 |
2051 #if defined(USE_AURA) || defined(OS_MACOSX) | 2052 #if defined(USE_AURA) || defined(OS_MACOSX) |
2052 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor, | 2053 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor, |
2053 WebViewCaptureTest, | 2054 WebViewCaptureTest, |
2054 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); | 2055 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); |
2055 #endif | 2056 #endif |
OLD | NEW |