Revert 196479 "Revert 196446 "Make touch drag drop and touch edi..."

trunk/src/ui/views/view.cc

Index: trunk/src/ui/views/view.cc
===================================================================
--- trunk/src/ui/views/view.cc	(revision 196798)
+++ trunk/src/ui/views/view.cc	(working copy)
@@ -9,7 +9,6 @@
 #include <algorithm>
 #include <cmath>
 
-#include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -19,7 +18,7 @@
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/ui_base_switches.h"
+#include "ui/base/ui_base_switches_util.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
@@ -108,8 +107,7 @@
  public:
   explicit PostEventDispatchHandler(View* owner)
       : owner_(owner),
-        touch_dnd_enabled_(CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableTouchDragDrop)) {
+        touch_dnd_enabled_(switches::IsTouchDragDropEnabled()) {
   }
   virtual ~PostEventDispatchHandler() {}
 
Property changes on: trunk/src/ui/views/view.cc
___________________________________________________________________
Added: svn:mergeinfo