| 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 "base/path_service.h" | 5 #include "base/path_service.h" |
| 6 #include "base/process/process.h" | 6 #include "base/process/process.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 2194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2205 ASSERT_TRUE(RunPlatformAppTestWithArg( | 2205 ASSERT_TRUE(RunPlatformAppTestWithArg( |
| 2206 "platform_apps/web_view/common", "screen_coordinates")) | 2206 "platform_apps/web_view/common", "screen_coordinates")) |
| 2207 << message_; | 2207 << message_; |
| 2208 } | 2208 } |
| 2209 | 2209 |
| 2210 #if defined(OS_CHROMEOS) | 2210 #if defined(OS_CHROMEOS) |
| 2211 IN_PROC_BROWSER_TEST_F(WebViewTest, ChromeVoxInjection) { | 2211 IN_PROC_BROWSER_TEST_F(WebViewTest, ChromeVoxInjection) { |
| 2212 EXPECT_FALSE( | 2212 EXPECT_FALSE( |
| 2213 chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled()); | 2213 chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled()); |
| 2214 | 2214 |
| 2215 chromeos::SpeechMonitor monitor; |
| 2216 chromeos::AccessibilityManager::Get()->EnableSpokenFeedback( |
| 2217 true, ui::A11Y_NOTIFICATION_NONE); |
| 2218 EXPECT_TRUE(monitor.SkipChromeVoxEnabledMessage()); |
| 2219 |
| 2215 ASSERT_TRUE(StartEmbeddedTestServer()); | 2220 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 2216 content::WebContents* guest_web_contents = LoadGuest( | 2221 content::WebContents* guest_web_contents = LoadGuest( |
| 2217 "/extensions/platform_apps/web_view/chromevox_injection/guest.html", | 2222 "/extensions/platform_apps/web_view/chromevox_injection/guest.html", |
| 2218 "web_view/chromevox_injection"); | 2223 "web_view/chromevox_injection"); |
| 2219 ASSERT_TRUE(guest_web_contents); | 2224 ASSERT_TRUE(guest_web_contents); |
| 2220 | 2225 |
| 2221 chromeos::SpeechMonitor monitor; | |
| 2222 chromeos::AccessibilityManager::Get()->EnableSpokenFeedback( | |
| 2223 true, ui::A11Y_NOTIFICATION_NONE); | |
| 2224 EXPECT_TRUE(monitor.SkipChromeVoxEnabledMessage()); | |
| 2225 | |
| 2226 EXPECT_EQ("chrome vox test title", monitor.GetNextUtterance()); | 2226 EXPECT_EQ("chrome vox test title", monitor.GetNextUtterance()); |
| 2227 } | 2227 } |
| 2228 #endif | 2228 #endif |
| 2229 | 2229 |
| 2230 // Flaky on Windows. http://crbug.com/303966 | 2230 // Flaky on Windows. http://crbug.com/303966 |
| 2231 #if defined(OS_WIN) | 2231 #if defined(OS_WIN) |
| 2232 #define MAYBE_TearDownTest DISABLED_TearDownTest | 2232 #define MAYBE_TearDownTest DISABLED_TearDownTest |
| 2233 #else | 2233 #else |
| 2234 #define MAYBE_TearDownTest TearDownTest | 2234 #define MAYBE_TearDownTest TearDownTest |
| 2235 #endif | 2235 #endif |
| (...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2777 // This test verifies that the allowtransparency attribute properly propagates | 2777 // This test verifies that the allowtransparency attribute properly propagates |
| 2778 IN_PROC_BROWSER_TEST_F(WebViewTest, AllowTransparencyAndAllowScalingPropagate) { | 2778 IN_PROC_BROWSER_TEST_F(WebViewTest, AllowTransparencyAndAllowScalingPropagate) { |
| 2779 LoadAppWithGuest("web_view/simple"); | 2779 LoadAppWithGuest("web_view/simple"); |
| 2780 | 2780 |
| 2781 ASSERT_TRUE(!!GetGuestWebContents()); | 2781 ASSERT_TRUE(!!GetGuestWebContents()); |
| 2782 extensions::WebViewGuest* guest = | 2782 extensions::WebViewGuest* guest = |
| 2783 extensions::WebViewGuest::FromWebContents(GetGuestWebContents()); | 2783 extensions::WebViewGuest::FromWebContents(GetGuestWebContents()); |
| 2784 ASSERT_TRUE(guest->allow_transparency()); | 2784 ASSERT_TRUE(guest->allow_transparency()); |
| 2785 ASSERT_TRUE(guest->allow_scaling()); | 2785 ASSERT_TRUE(guest->allow_scaling()); |
| 2786 } | 2786 } |
| OLD | NEW |