Revert 276728 "Fix slop region boundary handling."

trunk/src/ui/events/gestures/gesture_recognizer_impl.cc

 // Copyright (c) 2012 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 "ui/events/gestures/gesture_recognizer_impl.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_switches.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gestures/gesture_configuration.h"
 #include "ui/events/gestures/gesture_sequence.h"
 #include "ui/events/gestures/gesture_types.h"
-#include "ui/events/gestures/unified_gesture_detector_enabled.h"
 
 namespace ui {
 
 namespace {
 
 template <typename T>
 void TransferConsumer(GestureConsumer* current_consumer,
                       GestureConsumer* new_consumer,
                       std::map<GestureConsumer*, T>* map) {
   if (map->count(current_consumer)) {
@@ skipping 31 matching lines @@
 GestureProviderAura* CreateGestureProvider(GestureProviderAuraClient* client) {
   return new GestureProviderAura(client);
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // GestureRecognizerImpl, public:
 
 GestureRecognizerImpl::GestureRecognizerImpl() {
-  use_unified_gesture_detector_ = IsUnifiedGestureDetectorEnabled();
+  // Default to not using the unified gesture detector.
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  const std::string unified_gd_enabled_switch =
+      command_line.HasSwitch(switches::kUnifiedGestureDetector) ?
+      command_line.GetSwitchValueASCII(switches::kUnifiedGestureDetector) :
+      switches::kUnifiedGestureDetectorAuto;
+
+  const bool kUseUnifiedGestureDetectorByDefault = false;
+  if (unified_gd_enabled_switch.empty() ||
+      unified_gd_enabled_switch == switches::kUnifiedGestureDetectorEnabled) {
+    use_unified_gesture_detector_ = true;
+  } else if (unified_gd_enabled_switch ==
+                 switches::kUnifiedGestureDetectorDisabled) {
+    use_unified_gesture_detector_ = false;
+  } else if (unified_gd_enabled_switch ==
+             switches::kUnifiedGestureDetectorAuto) {
+    use_unified_gesture_detector_ = kUseUnifiedGestureDetectorByDefault;
+  } else {
+    LOG(ERROR) << "Invalid --unified-gesture-detector option: "
+               << unified_gd_enabled_switch;
+    use_unified_gesture_detector_ = false;
+  }
 }
 
 GestureRecognizerImpl::~GestureRecognizerImpl() {
   STLDeleteValues(&consumer_sequence_);
   STLDeleteValues(&consumer_gesture_provider_);
 }
 
 // Checks if this finger is already down, if so, returns the current target.
 // Otherwise, returns NULL.
 GestureConsumer* GestureRecognizerImpl::GetTouchLockedTarget(
@@ skipping 308 matching lines @@
   std::vector<GestureEventHelper*>::iterator it;
   for (it = helpers.begin(); it != helpers.end(); ++it)
     gesture_recognizer->AddGestureEventHelper(*it);
 
   helpers.clear();
   g_gesture_recognizer_instance =
       static_cast<GestureRecognizerImpl*>(gesture_recognizer);
 }
 
 }  // namespace ui