Merge gesture deletion and selection.

ui/keyboard/keyboard_util.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/keyboard/keyboard_util.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 152 matching lines @@
       switches::kFloatingVirtualKeyboardEnabled;
 }
 
 bool IsGestureTypingEnabled() {
   std::string keyboard_switch =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kGestureTyping);
   return keyboard_switch == switches::kGestureTypingEnabled;
 }
 
-bool IsGestureSelectionEnabled() {
+bool IsGestureEditingEnabled() {
   std::string keyboard_switch =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kGestureSelection);
-  return keyboard_switch != switches::kGestureSelectionDisabled;
-}
-
-bool IsGestureDeletionEnabled() {
-  std::string keyboard_switch =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kGestureDeletion);
-  return keyboard_switch != switches::kGestureDeletionDisabled;
+          switches::kGestureEditing);
+  return keyboard_switch == switches::kGestureEditingEnabled;
 }
 
 bool IsMaterialDesignEnabled() {
   return !base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableNewMDInputView);
 }
 
 bool IsVoiceInputEnabled() {
   return !base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableVoiceInput);
@@ skipping 254 matching lines @@
 }
 
 void LogKeyboardControlEvent(KeyboardControlEvent event) {
   UMA_HISTOGRAM_ENUMERATION(
       "VirtualKeyboard.KeyboardControlEvent",
       event,
       keyboard::KEYBOARD_CONTROL_MAX);
 }
 
 }  // namespace keyboard