Merge to M56: Revert "Toggle spoken feedback if two fingers are held down."

ui/chromeos/touch_exploration_controller.h

 // Copyright 2014 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.
 
 #ifndef UI_CHROMEOS_TOUCH_EXPLORATION_CONTROLLER_H_
 #define UI_CHROMEOS_TOUCH_EXPLORATION_CONTROLLER_H_
 
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/chromeos/ui_chromeos_export.h"
 #include "ui/events/event.h"
 #include "ui/events/event_rewriter.h"
 #include "ui/events/gesture_detection/gesture_detector.h"
 #include "ui/events/gestures/gesture_provider_aura.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace aura {
 class Window;
 }
 
 namespace ui {
 
 class Event;
 class GestureEvent;
 class GestureProviderAura;
-class TouchAccessibilityEnabler;
 class TouchEvent;
 
 // A delegate to handle commands in response to detected accessibility gesture
 // events.
 class TouchExplorationControllerDelegate {
  public:
   virtual ~TouchExplorationControllerDelegate() {}
 
   // Takes an int from 0.0 to 100.0 that indicates the percent the volume
   // should be set to.
@@ skipping 135 matching lines @@
 //
 // The caller is expected to retain ownership of instances of this class and
 // destroy them before |root_window| is destroyed.
 class UI_CHROMEOS_EXPORT TouchExplorationController
     : public ui::EventRewriter,
       public ui::GestureProviderAuraClient,
       public ui::GestureConsumer {
  public:
   explicit TouchExplorationController(
       aura::Window* root_window,
-      ui::TouchExplorationControllerDelegate* delegate,
-      TouchAccessibilityEnabler* touch_accessibility_enabler);
+      ui::TouchExplorationControllerDelegate* delegate);
   ~TouchExplorationController() override;
 
   // Make synthesized touch events are anchored at this point. This is
   // called when the object with accessibility focus is updated via something
   // other than touch exploration.
   void SetTouchAccessibilityAnchorPoint(const gfx::Point& anchor_point);
 
   // Events within the exclude bounds will not be rewritten.
   // |bounds| are in root window coordinates.
   void SetExcludeBounds(const gfx::Rect& bounds);
@@ skipping 305 matching lines @@
 
   // A copy of the previous event passed.
   std::unique_ptr<ui::TouchEvent> prev_event_;
 
   // This toggles whether VLOGS are turned on or not.
   bool VLOG_on_;
 
   // LocatedEvents within this area should be left alone.
   gfx::Rect exclude_bounds_;
 
-  // Code that detects a touch-screen gesture to enable or disable
-  // accessibility. That handler is always running, whereas this is not,
-  // but events need to be sent to TouchAccessibilityEnabler before being
-  // rewritten when TouchExplorationController is running.
-  TouchAccessibilityEnabler* touch_accessibility_enabler_;
-
   DISALLOW_COPY_AND_ASSIGN(TouchExplorationController);
 };
 
 }  // namespace ui
 
 #endif  // UI_CHROMEOS_TOUCH_EXPLORATION_CONTROLLER_H_