Merge gesture deletion and selection.

ui/keyboard/keyboard_util.h

 // 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.
 
 #ifndef UI_KEYBOARD_KEYBOARD_UTIL_H_
 #define UI_KEYBOARD_KEYBOARD_UTIL_H_
 
 #include <string>
 
 #include "base/strings/string16.h"
@@ skipping 81 matching lines @@
 
 // Returns true if experimental features are enabled for IME input-views.
 KEYBOARD_EXPORT bool IsExperimentalInputViewEnabled();
 
 // Returns true if floating virtual keyboard feature is enabled.
 KEYBOARD_EXPORT bool IsFloatingVirtualKeyboardEnabled();
 
 // Returns true if gesture typing is enabled for virtual keyboard.
 KEYBOARD_EXPORT bool IsGestureTypingEnabled();
 
 // Returns true if gesture deletion is enabled for virtual keyboard.

[bshe, 2015/05/12 14:58:59]

nit: s/deletion/editing in settings

[rsadam, 2015/05/12 15:16:15]

Done.

-KEYBOARD_EXPORT bool IsGestureDeletionEnabled();
-
-// Returns true if gesture selection is enabled for virtual keyboard.
-KEYBOARD_EXPORT bool IsGestureSelectionEnabled();
+KEYBOARD_EXPORT bool IsGestureEditingEnabled();
 
 // Returns true if material design is enabled for the keyboard.
 KEYBOARD_EXPORT bool IsMaterialDesignEnabled();
 
 // Returns true if voice input is enabled for the keyboard.
 KEYBOARD_EXPORT bool IsVoiceInputEnabled();
 
 // Insert |text| into the active TextInputClient if there is one. Returns true
 // if |text| was successfully inserted.
 KEYBOARD_EXPORT bool InsertText(const base::string16& text);
@@ skipping 37 matching lines @@
 
 // Gets the override content url.
 KEYBOARD_EXPORT const GURL& GetOverrideContentUrl();
 
 // Logs the keyboard control event as a UMA stat.
 void LogKeyboardControlEvent(KeyboardControlEvent event);
 
 }  // namespace keyboard
 
 #endif  // UI_KEYBOARD_KEYBOARD_UTIL_H_