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

trunk/src/ui/views/touchui/touch_selection_controller_impl.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 "ui/views/touchui/touch_selection_controller_impl.h"
 
-#include "base/command_line.h"
 #include "base/time.h"
 #include "grit/ui_strings.h"
-#include "ui/base/ui_base_switches.h"
+#include "ui/base/ui_base_switches_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/views/corewm/shadow_types.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Constants defining the visual attributes of selection handles
@@ skipping 392 matching lines @@
 
 bool TouchSelectionControllerImpl::IsCursorHandleVisible() {
   return cursor_handle_->visible();
 }
 
 ViewsTouchSelectionControllerFactory::ViewsTouchSelectionControllerFactory() {
 }
 
 ui::TouchSelectionController* ViewsTouchSelectionControllerFactory::create(
     ui::TouchEditable* client_view) {
-#if defined(OS_CHROMEOS)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableTouchEditing))
+  if (switches::IsTouchEditingEnabled())
     return new views::TouchSelectionControllerImpl(client_view);
-#endif
   return NULL;
 }
 
 }  // namespace views