| 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 <queue> | 5 #include <queue> |
| 6 #include <set> | 6 #include <set> |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
| 10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 #include "ui/gl/gl_switches.h" | 88 #include "ui/gl/gl_switches.h" |
| 89 #include "ui/views/view.h" | 89 #include "ui/views/view.h" |
| 90 #include "ui/views/widget/widget.h" | 90 #include "ui/views/widget/widget.h" |
| 91 | 91 |
| 92 #if BUILDFLAG(ENABLE_PLUGINS) | 92 #if BUILDFLAG(ENABLE_PLUGINS) |
| 93 #include "content/public/browser/plugin_service.h" | 93 #include "content/public/browser/plugin_service.h" |
| 94 #include "content/public/common/webplugininfo.h" | 94 #include "content/public/common/webplugininfo.h" |
| 95 #include "content/public/test/ppapi_test_utils.h" | 95 #include "content/public/test/ppapi_test_utils.h" |
| 96 #endif | 96 #endif |
| 97 | 97 |
| 98 #if defined(OS_CHROMEOS) | |
| 99 #include "ash/common/accessibility_types.h" | |
| 100 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | |
| 101 #include "chrome/browser/chromeos/accessibility/speech_monitor.h" | |
| 102 #endif | |
| 103 | |
| 104 using extensions::ContextMenuMatcher; | 98 using extensions::ContextMenuMatcher; |
| 105 using extensions::ExtensionsAPIClient; | 99 using extensions::ExtensionsAPIClient; |
| 106 using extensions::MenuItem; | 100 using extensions::MenuItem; |
| 107 using guest_view::GuestViewManager; | 101 using guest_view::GuestViewManager; |
| 108 using guest_view::TestGuestViewManager; | 102 using guest_view::TestGuestViewManager; |
| 109 using guest_view::TestGuestViewManagerFactory; | 103 using guest_view::TestGuestViewManagerFactory; |
| 110 using prerender::PrerenderLinkManager; | 104 using prerender::PrerenderLinkManager; |
| 111 using prerender::PrerenderLinkManagerFactory; | 105 using prerender::PrerenderLinkManagerFactory; |
| 112 using task_manager::browsertest_util::MatchAboutBlankTab; | 106 using task_manager::browsertest_util::MatchAboutBlankTab; |
| 113 using task_manager::browsertest_util::MatchAnyApp; | 107 using task_manager::browsertest_util::MatchAnyApp; |
| (...skipping 2101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2215 } | 2209 } |
| 2216 | 2210 |
| 2217 // Checks that window.screenX/screenY/screenLeft/screenTop works correctly for | 2211 // Checks that window.screenX/screenY/screenLeft/screenTop works correctly for |
| 2218 // guests. | 2212 // guests. |
| 2219 IN_PROC_BROWSER_TEST_P(WebViewTest, ScreenCoordinates) { | 2213 IN_PROC_BROWSER_TEST_P(WebViewTest, ScreenCoordinates) { |
| 2220 ASSERT_TRUE(RunPlatformAppTestWithArg( | 2214 ASSERT_TRUE(RunPlatformAppTestWithArg( |
| 2221 "platform_apps/web_view/common", "screen_coordinates")) | 2215 "platform_apps/web_view/common", "screen_coordinates")) |
| 2222 << message_; | 2216 << message_; |
| 2223 } | 2217 } |
| 2224 | 2218 |
| 2225 #if defined(OS_CHROMEOS) | |
| 2226 // Flaky, see http://crbug.com/611736. | |
| 2227 IN_PROC_BROWSER_TEST_P(WebViewTest, DISABLED_ChromeVoxInjection) { | |
| 2228 EXPECT_FALSE( | |
| 2229 chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled()); | |
| 2230 | |
| 2231 chromeos::SpeechMonitor monitor; | |
| 2232 chromeos::AccessibilityManager::Get()->EnableSpokenFeedback( | |
| 2233 true, ash::A11Y_NOTIFICATION_NONE); | |
| 2234 EXPECT_TRUE(monitor.SkipChromeVoxEnabledMessage()); | |
| 2235 | |
| 2236 ASSERT_TRUE(StartEmbeddedTestServer()); | |
| 2237 content::WebContents* guest_web_contents = LoadGuest( | |
| 2238 "/extensions/platform_apps/web_view/chromevox_injection/guest.html", | |
| 2239 "web_view/chromevox_injection"); | |
| 2240 ASSERT_TRUE(guest_web_contents); | |
| 2241 | |
| 2242 for (;;) { | |
| 2243 if (monitor.GetNextUtterance() == "chrome vox test title") | |
| 2244 break; | |
| 2245 } | |
| 2246 } | |
| 2247 #endif | |
| 2248 | |
| 2249 // Flaky on Windows. http://crbug.com/303966 | 2219 // Flaky on Windows. http://crbug.com/303966 |
| 2250 #if defined(OS_WIN) | 2220 #if defined(OS_WIN) |
| 2251 #define MAYBE_TearDownTest DISABLED_TearDownTest | 2221 #define MAYBE_TearDownTest DISABLED_TearDownTest |
| 2252 #else | 2222 #else |
| 2253 #define MAYBE_TearDownTest TearDownTest | 2223 #define MAYBE_TearDownTest TearDownTest |
| 2254 #endif | 2224 #endif |
| 2255 IN_PROC_BROWSER_TEST_P(WebViewTest, MAYBE_TearDownTest) { | 2225 IN_PROC_BROWSER_TEST_P(WebViewTest, MAYBE_TearDownTest) { |
| 2256 const extensions::Extension* extension = | 2226 const extensions::Extension* extension = |
| 2257 LoadAndLaunchPlatformApp("web_view/simple", "WebViewTest.LAUNCHED"); | 2227 LoadAndLaunchPlatformApp("web_view/simple", "WebViewTest.LAUNCHED"); |
| 2258 extensions::AppWindow* window = NULL; | 2228 extensions::AppWindow* window = NULL; |
| (...skipping 1661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3920 ClosingChromeSignInShouldNotCrash) { | 3890 ClosingChromeSignInShouldNotCrash) { |
| 3921 GURL signin_url{"chrome://chrome-signin"}; | 3891 GURL signin_url{"chrome://chrome-signin"}; |
| 3922 | 3892 |
| 3923 AddTabAtIndex(0, signin_url, ui::PAGE_TRANSITION_TYPED); | 3893 AddTabAtIndex(0, signin_url, ui::PAGE_TRANSITION_TYPED); |
| 3924 AddTabAtIndex(1, signin_url, ui::PAGE_TRANSITION_TYPED); | 3894 AddTabAtIndex(1, signin_url, ui::PAGE_TRANSITION_TYPED); |
| 3925 WaitForWebViewInDom(); | 3895 WaitForWebViewInDom(); |
| 3926 | 3896 |
| 3927 chrome::CloseTab(browser()); | 3897 chrome::CloseTab(browser()); |
| 3928 } | 3898 } |
| 3929 #endif | 3899 #endif |
| OLD | NEW |