Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(401)

Unified Diff: ui/keyboard/keyboard_util.cc

Issue 1130833005: Merge gesture deletion and selection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update histograms.xml Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ui/keyboard/keyboard_util.h ('K') | « ui/keyboard/keyboard_util.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/keyboard/keyboard_util.cc
diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc
index 1c6b0f6b5e3ed89c7de2d3d54adb0b7ce8bb5ede..09f8890631e8113dd6caaf8196d1f77be1d0f1c7 100644
--- a/ui/keyboard/keyboard_util.cc
+++ b/ui/keyboard/keyboard_util.cc
@@ -170,18 +170,11 @@ bool IsGestureTypingEnabled() {
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() {
« ui/keyboard/keyboard_util.h ('K') | « ui/keyboard/keyboard_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698