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

chrome/browser/chromeos/accessibility/accessibility_manager.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 539 matching lines @@
   if (cl->HasSwitch(kAshDisableSystemSounds))
     return false;
   if (option == PlaySoundOption::SPOKEN_FEEDBACK_ENABLED &&
       !IsSpokenFeedbackEnabled() && !cl->HasSwitch(kAshEnableSystemSounds)) {
     return false;
   }
   return media::SoundsManager::Get()->Play(sound_key);
 }
 
 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)
     return false;
 
   if (!connector->IsEnterpriseManaged())
     return false;
 
   const policy::DeviceCloudPolicyManagerChromeOS* const
       device_cloud_policy_manager = connector->GetDeviceCloudPolicyManager();
   if (!device_cloud_policy_manager)
     return false;
 
   if (!device_cloud_policy_manager->IsRemoraRequisition())
     return false;
 
   KioskAppManager* manager = KioskAppManager::Get();
   KioskAppManager::App app;
   CHECK(manager->GetApp(manager->GetAutoLaunchApp(), &app));
   return app.was_auto_launched_with_zero_delay;
+#endif
 }
 
 bool AccessibilityManager::PlaySpokenFeedbackToggleCountdown(int tick_count) {
   return media::SoundsManager::Get()->Play(
       tick_count % 2 ? SOUND_SPOKEN_FEEDBACK_TOGGLE_COUNTDOWN_HIGH
                      : SOUND_SPOKEN_FEEDBACK_TOGGLE_COUNTDOWN_LOW);
 }
 
 void AccessibilityManager::HandleAccessibilityGesture(ui::AXGesture gesture) {
   extensions::EventRouter* event_router =
@@ skipping 777 matching lines @@
     content::BrowserContext* context) {
   keyboard_listener_extension_id_ = id;
 
   extensions::ExtensionRegistry* registry =
       extensions::ExtensionRegistry::Get(context);
   if (!extension_registry_observer_.IsObserving(registry) && !id.empty())
     extension_registry_observer_.Add(registry);
 }
 
 }  // namespace chromeos