Merge to M57: Temporarily disable two-finger spoken feedback toggle.

chrome/browser/chromeos/accessibility/accessibility_manager.cc

Index: chrome/browser/chromeos/accessibility/accessibility_manager.cc
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
index 913c2af603bfd2a8000c06e53afe05734ec3f165..55f29143788f0b746190137846e803991c63f6dc 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -557,6 +557,11 @@ bool AccessibilityManager::PlayEarcon(int sound_key, PlaySoundOption option) {
 }
 
 bool AccessibilityManager::ShouldToggleSpokenFeedbackViaTouch() {
+#if 1
+  // Temporarily disabling this feature until UI feedback is fixed.
+  // http://crbug.com/662501
+  return false;
+#else
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   if (!connector)
@@ -577,6 +582,7 @@ bool AccessibilityManager::ShouldToggleSpokenFeedbackViaTouch() {
   KioskAppManager::App app;
   CHECK(manager->GetApp(manager->GetAutoLaunchApp(), &app));
   return app.was_auto_launched_with_zero_delay;
+#endif
 }
 
 bool AccessibilityManager::PlaySpokenFeedbackToggleCountdown(int tick_count) {