diff options
Diffstat (limited to 'chrome/browser/chromeos')
3 files changed, 17 insertions, 28 deletions
diff --git a/chrome/browser/chromeos/accessibility/accessibility_util.cc b/chrome/browser/chromeos/accessibility/accessibility_util.cc index 949b9f2..3d2d95d 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_util.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_util.cc @@ -7,13 +7,8 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/singleton_tabs.h" -#include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/public/test/browser_test_utils.h" -#include "extensions/browser/extension_host.h" -#include "extensions/browser/extension_system.h" -#include "extensions/browser/process_manager.h" #include "url/gurl.h" // TODO(yoshiki): move the following method to accessibility_manager.cc and @@ -43,20 +38,5 @@ void ShowAccessibilityHelp(Browser* browser) { chrome::ShowSingletonTab(browser, GURL(chrome::kChromeAccessibilityHelpURL)); } - -void SimulateTouchScreenInChromeVoxForTest(content::BrowserContext* profile) { - // ChromeVox looks at whether 'ontouchstart' exists to know whether or not it - // should respond to hover events. Fake it so that touch exploration events - // get spoken. - extensions::ExtensionHost* host = - extensions::ExtensionSystem::Get(profile) - ->process_manager() - ->GetBackgroundHostForExtension( - extension_misc::kChromeVoxExtensionId); - CHECK(content::ExecuteScript( - host->host_contents(), - "if (!('ontouchstart' in window)) window.ontouchstart = function() {};")); -} - } // namespace accessibility } // namespace chromeos diff --git a/chrome/browser/chromeos/accessibility/accessibility_util.h b/chrome/browser/chromeos/accessibility/accessibility_util.h index b4d2e58..7f70312 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_util.h +++ b/chrome/browser/chromeos/accessibility/accessibility_util.h @@ -7,10 +7,6 @@ class Browser; -namespace content { -class BrowserContext; -} - namespace chromeos { namespace accessibility { @@ -23,8 +19,6 @@ bool IsVirtualKeyboardEnabled(); // Shows the accessibility help tab on the browser. void ShowAccessibilityHelp(Browser* browser); -void SimulateTouchScreenInChromeVoxForTest(content::BrowserContext* profile); - } // namespace accessibility } // namespace chromeos diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc index 5cfb990..56108d6 100644 --- a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc @@ -10,7 +10,6 @@ #include "base/strings/string_util.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" -#include "chrome/browser/chromeos/accessibility/accessibility_util.h" #include "chrome/browser/chromeos/accessibility/speech_monitor.h" #include "chrome/browser/chromeos/login/ui/login_display_host.h" #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" @@ -23,6 +22,7 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/extensions/extension_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/testing_profile.h" @@ -32,6 +32,8 @@ #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_host.h" +#include "extensions/browser/process_manager.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/test/ui_controls.h" #include "ui/views/widget/widget.h" @@ -65,6 +67,19 @@ class LoggedInSpokenFeedbackTest : public InProcessBrowserTest { root_window, key, false, false, false, false)); } + void SimulateTouchScreenInChromeVox() { + // ChromeVox looks at whether 'ontouchstart' exists to know whether + // or not it should respond to hover events. Fake it so that touch + // exploration events get spoken. + extensions::ExtensionHost* host = + extensions::ExtensionSystem::Get(browser()->profile())-> + process_manager()->GetBackgroundHostForExtension( + extension_misc::kChromeVoxExtensionId); + CHECK(content::ExecuteScript( + host->host_contents(), + "window.ontouchstart = function() {};")); + } + private: StubBrailleController braille_controller_; DISALLOW_COPY_AND_ASSIGN(LoggedInSpokenFeedbackTest); @@ -217,7 +232,7 @@ IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, TouchExploreStatusTray) { true, ash::A11Y_NOTIFICATION_NONE); EXPECT_TRUE(monitor.SkipChromeVoxEnabledMessage()); - accessibility::SimulateTouchScreenInChromeVoxForTest(browser()->profile()); + SimulateTouchScreenInChromeVox(); // Send an accessibility hover event on the system tray, which is // what we get when you tap it on a touch screen when ChromeVox is on. |