Remove leftover bits of the floating-virtual-keyboard flag.

This is now redundant with the enable-floating-virtual-keyboard flag and some of the configs were mismatched between the two potentially causing problems. Also remove some of the switch-specific code for the new enable-floating-virtual-keyboard flag because it is no longer a switch and rather a feature flag. Bug: Change-Id: I127d598eedc5905187afbdfa86a778f8078d7d24 Reviewed-on: https://chromium-review.googlesource.com/741423 Reviewed-by: Yuichiro Hanada <yhanada@chromium.org> Commit-Queue: Blake O'Hare <blakeo@chromium.org> Cr-Commit-Position: refs/heads/master@{#512113}
cbchan · Oct 27, 2017 · 3fe7e78 · 3fe7e78
1 parent 20abd5f
commit 3fe7e78
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 15 deletions.
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
@@ -1759,10 +1759,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kExperimentalInputViewFeaturesDescription, kOsCrOS,
      SINGLE_VALUE_TYPE(
          keyboard::switches::kEnableExperimentalInputViewFeatures)},
-    {"floating-virtual-keyboard",
-     flag_descriptions::kFloatingVirtualKeyboardName,
-     flag_descriptions::kFloatingVirtualKeyboardDescription, kOsCrOS,
-     SINGLE_VALUE_TYPE(keyboard::switches::kEnableFloatingVirtualKeyboard)},
     {"gesture-typing", flag_descriptions::kGestureTypingName,
      flag_descriptions::kGestureTypingDescription, kOsCrOS,
      SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableGestureTyping)},

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
@@ -2493,10 +2493,6 @@ const char kFirstRunUiTransitionsName[] =
 const char kFirstRunUiTransitionsDescription[] =
     "Transitions during first-run tutorial are animated.";
 
-const char kFloatingVirtualKeyboardName[] = "Floating virtual keyboard.";
-const char kFloatingVirtualKeyboardDescription[] =
-    "Enable/Disable floating virtual keyboard.";
-
 const char kForceEnableStylusToolsName[] = "Force enable stylus features";
 const char kForceEnableStylusToolsDescription[] =
     "Forces display of the stylus tools menu in the shelf and the stylus "

diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
@@ -1539,9 +1539,6 @@ extern const char kFileManagerTouchModeDescription[];
 extern const char kFirstRunUiTransitionsName[];
 extern const char kFirstRunUiTransitionsDescription[];
 
-extern const char kFloatingVirtualKeyboardName[];
-extern const char kFloatingVirtualKeyboardDescription[];
-
 extern const char kForceEnableStylusToolsName[];
 extern const char kForceEnableStylusToolsDescription[];
 

diff --git a/ui/keyboard/keyboard_switches.cc b/ui/keyboard/keyboard_switches.cc
@@ -14,8 +14,6 @@ const char kDisableVoiceInput[] = "disable-voice-input";
 const char kDisableGestureTyping[] = "disable-gesture-typing";
 const char kDisableGestureEditing[] = "disable-gesture-editing";
 const char kEnableVirtualKeyboard[] = "enable-virtual-keyboard";
-const char kEnableFloatingVirtualKeyboard[] =
-    "enable-floating-virtual-keyboard";
 const char kDisableVirtualKeyboardOverscroll[] =
     "disable-virtual-keyboard-overscroll";
 

diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc
@@ -189,8 +189,7 @@ bool IsExperimentalInputViewEnabled() {
 }
 
 bool IsFloatingVirtualKeyboardEnabled() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableFloatingVirtualKeyboard);
+  return false;
 }
 
 bool IsGestureTypingEnabled() {