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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 #include "ui/views/view.h" | 87 #include "ui/views/view.h" |
88 #include "ui/views/widget/widget.h" | 88 #include "ui/views/widget/widget.h" |
89 | 89 |
90 #if defined(ENABLE_PLUGINS) | 90 #if defined(ENABLE_PLUGINS) |
91 #include "content/public/browser/plugin_service.h" | 91 #include "content/public/browser/plugin_service.h" |
92 #include "content/public/common/webplugininfo.h" | 92 #include "content/public/common/webplugininfo.h" |
93 #include "content/public/test/ppapi_test_utils.h" | 93 #include "content/public/test/ppapi_test_utils.h" |
94 #endif | 94 #endif |
95 | 95 |
96 #if defined(OS_CHROMEOS) | 96 #if defined(OS_CHROMEOS) |
| 97 #include "ash/common/accessibility_types.h" |
97 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 98 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
98 #include "chrome/browser/chromeos/accessibility/speech_monitor.h" | 99 #include "chrome/browser/chromeos/accessibility/speech_monitor.h" |
99 #endif | 100 #endif |
100 | 101 |
101 using extensions::ContextMenuMatcher; | 102 using extensions::ContextMenuMatcher; |
102 using extensions::ExtensionsAPIClient; | 103 using extensions::ExtensionsAPIClient; |
103 using extensions::MenuItem; | 104 using extensions::MenuItem; |
104 using guest_view::GuestViewManager; | 105 using guest_view::GuestViewManager; |
105 using guest_view::TestGuestViewManager; | 106 using guest_view::TestGuestViewManager; |
106 using guest_view::TestGuestViewManagerFactory; | 107 using guest_view::TestGuestViewManagerFactory; |
(...skipping 1955 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2062 } | 2063 } |
2063 | 2064 |
2064 #if defined(OS_CHROMEOS) | 2065 #if defined(OS_CHROMEOS) |
2065 // Flaky, see http://crbug.com/611736. | 2066 // Flaky, see http://crbug.com/611736. |
2066 IN_PROC_BROWSER_TEST_P(WebViewTest, DISABLED_ChromeVoxInjection) { | 2067 IN_PROC_BROWSER_TEST_P(WebViewTest, DISABLED_ChromeVoxInjection) { |
2067 EXPECT_FALSE( | 2068 EXPECT_FALSE( |
2068 chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled()); | 2069 chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled()); |
2069 | 2070 |
2070 chromeos::SpeechMonitor monitor; | 2071 chromeos::SpeechMonitor monitor; |
2071 chromeos::AccessibilityManager::Get()->EnableSpokenFeedback( | 2072 chromeos::AccessibilityManager::Get()->EnableSpokenFeedback( |
2072 true, ui::A11Y_NOTIFICATION_NONE); | 2073 true, ash::A11Y_NOTIFICATION_NONE); |
2073 EXPECT_TRUE(monitor.SkipChromeVoxEnabledMessage()); | 2074 EXPECT_TRUE(monitor.SkipChromeVoxEnabledMessage()); |
2074 | 2075 |
2075 ASSERT_TRUE(StartEmbeddedTestServer()); | 2076 ASSERT_TRUE(StartEmbeddedTestServer()); |
2076 content::WebContents* guest_web_contents = LoadGuest( | 2077 content::WebContents* guest_web_contents = LoadGuest( |
2077 "/extensions/platform_apps/web_view/chromevox_injection/guest.html", | 2078 "/extensions/platform_apps/web_view/chromevox_injection/guest.html", |
2078 "web_view/chromevox_injection"); | 2079 "web_view/chromevox_injection"); |
2079 ASSERT_TRUE(guest_web_contents); | 2080 ASSERT_TRUE(guest_web_contents); |
2080 | 2081 |
2081 for (;;) { | 2082 for (;;) { |
2082 if (monitor.GetNextUtterance() == "chrome vox test title") | 2083 if (monitor.GetNextUtterance() == "chrome vox test title") |
(...skipping 1513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3596 gfx::Point embedder_origin = | 3597 gfx::Point embedder_origin = |
3597 GetEmbedderWebContents()->GetContainerBounds().origin(); | 3598 GetEmbedderWebContents()->GetContainerBounds().origin(); |
3598 guest_rect.Offset(-embedder_origin.x(), -embedder_origin.y()); | 3599 guest_rect.Offset(-embedder_origin.x(), -embedder_origin.y()); |
3599 | 3600 |
3600 // Generate and send synthetic touch event. | 3601 // Generate and send synthetic touch event. |
3601 content::SimulateTouchPressAt(GetEmbedderWebContents(), | 3602 content::SimulateTouchPressAt(GetEmbedderWebContents(), |
3602 guest_rect.CenterPoint()); | 3603 guest_rect.CenterPoint()); |
3603 EXPECT_TRUE(aura_webview->HasFocus()); | 3604 EXPECT_TRUE(aura_webview->HasFocus()); |
3604 } | 3605 } |
3605 #endif | 3606 #endif |
OLD | NEW |