Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2285)

Unified Diff: ui/chromeos/touch_exploration_controller.cc

Issue 2535723008: Revert "Toggle spoken feedback if two fingers are held down." (Closed)
Patch Set: Don't revert metrics changes Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/chromeos/touch_exploration_controller.h ('k') | ui/chromeos/touch_exploration_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/chromeos/touch_exploration_controller.cc
diff --git a/ui/chromeos/touch_exploration_controller.cc b/ui/chromeos/touch_exploration_controller.cc
index 584c1a10da0bb5f78ee07d2212c868177ec5a4fe..6288ed18a31b3452ffd5320fae561c3a1ef4539c 100644
--- a/ui/chromeos/touch_exploration_controller.cc
+++ b/ui/chromeos/touch_exploration_controller.cc
@@ -13,7 +13,6 @@
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_tree_host.h"
-#include "ui/chromeos/touch_accessibility_enabler.h"
#include "ui/events/event.h"
#include "ui/events/event_processor.h"
#include "ui/events/event_utils.h"
@@ -41,16 +40,14 @@ void SetTouchAccessibilityFlag(ui::Event* event) {
TouchExplorationController::TouchExplorationController(
aura::Window* root_window,
- TouchExplorationControllerDelegate* delegate,
- TouchAccessibilityEnabler* touch_accessibility_enabler)
+ TouchExplorationControllerDelegate* delegate)
: root_window_(root_window),
delegate_(delegate),
state_(NO_FINGERS_DOWN),
anchor_point_state_(ANCHOR_POINT_NONE),
gesture_provider_(new GestureProviderAura(this, this)),
prev_state_(NO_FINGERS_DOWN),
- VLOG_on_(true),
- touch_accessibility_enabler_(touch_accessibility_enabler) {
+ VLOG_on_(true) {
DCHECK(root_window);
root_window->GetHost()->GetEventSource()->AddEventRewriter(this);
}
@@ -87,10 +84,6 @@ ui::EventRewriteStatus TouchExplorationController::RewriteEvent(
}
const ui::TouchEvent& touch_event = static_cast<const ui::TouchEvent&>(event);
- // Let TouchAccessibilityEnabler process the unrewritten event.
- if (touch_accessibility_enabler_)
- touch_accessibility_enabler_->HandleTouchEvent(touch_event);
-
if (!exclude_bounds_.IsEmpty()) {
gfx::Point location = touch_event.location();
root_window_->GetHost()->ConvertScreenInPixelsToDIP(&location);
« no previous file with comments | « ui/chromeos/touch_exploration_controller.h ('k') | ui/chromeos/touch_exploration_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698