[VK] Remove flags for virtual keyboard.

We remove flags for:
- EnableFloatingVirtualKeyboard
- EnableVirtualKeyboardMdUi

as both are features that already launched in M70.

Bug: 856195, 771466
Change-Id: Ifcba7c9654d491ab1b6cc210314823c4f49f8a4c
Reviewed-on: https://chromium-review.googlesource.com/c/1341437Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Darren Shen <shend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609457}

chrome/browser/about_flags.cc

@@ -3382,10 +3382,6 @@ const FeatureEntry kFeatureEntries[] = {
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_CHROMEOS)
-    {"enable-floating-virtual-keyboard",
-     flag_descriptions::kEnableFloatingVirtualKeyboardName,
-     flag_descriptions::kEnableFloatingVirtualKeyboardDescription, kOsCrOS,
-     FEATURE_VALUE_TYPE(features::kEnableFloatingVirtualKeyboard)},
     {"enable-stylus-virtual-keyboard",
      flag_descriptions::kEnableStylusVirtualKeyboardName,
      flag_descriptions::kEnableStylusVirtualKeyboardDescription, kOsCrOS,
@@ -3398,10 +3394,6 @@ const FeatureEntry kFeatureEntries[] = {
     {"enable-per-user-timezone", flag_descriptions::kEnablePerUserTimezoneName,
      flag_descriptions::kEnablePerUserTimezoneDescription, kOsCrOS,
      SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisablePerUserTimezone)},
-    {"enable-virtual-keyboard-md-ui",
-     flag_descriptions::kEnableVirtualKeyboardMdUiName,
-     flag_descriptions::kEnableVirtualKeyboardMdUiDescription, kOsCrOS,
-     FEATURE_VALUE_TYPE(features::kEnableVirtualKeyboardMdUi)},
     {"enable-virtual-keyboard-ukm",
      flag_descriptions::kEnableVirtualKeyboardUkmName,
      flag_descriptions::kEnableVirtualKeyboardUkmDescription, kOsCrOS,

chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc

@@ -354,36 +354,16 @@ void ChromeVirtualKeyboardDelegate::OnHasInputDevices(
   results->SetBoolean("hotrodmode", g_hotrod_keyboard_enabled);
   std::unique_ptr<base::ListValue> features(new base::ListValue());
 
-  // 'floatingvirtualkeyboard' is the name of the feature flag for the legacy
-  // floating keyboard that was prototyped quite some time ago. It is currently
-  // referenced by the extension even though we never enable this value and so
-  // re-using that value is not feasible due to the semi-tandem nature of the
-  // keyboard extension. The 'floatingkeybard' flag represents the new floating
-  // keyboard and should be used for new extension-side feature work for the
-  // floating keyboard.
-  // TODO(blakeo): once the old flag's usages have been removed from the
-  // extension and all pushes have settled, remove this overly verbose comment.
-  features->AppendString(GenerateFeatureFlag(
-      "floatingkeyboard",
-      base::FeatureList::IsEnabled(features::kEnableFloatingVirtualKeyboard)));
+  features->AppendString(GenerateFeatureFlag("floatingkeyboard", true));
   features->AppendString(GenerateFeatureFlag(
       "gesturetyping", !base::CommandLine::ForCurrentProcess()->HasSwitch(
                            keyboard::switches::kDisableGestureTyping)));
-  // TODO(shend): Gesture editing is not implemented in the MD UI.
-  // https://crbug.com/890134.
-  bool enable_gesture_editing =
-      !base::FeatureList::IsEnabled(features::kEnableVirtualKeyboardMdUi) &&
-      !base::CommandLine::ForCurrentProcess()->HasSwitch(
-          keyboard::switches::kDisableGestureEditing);
-  features->AppendString(
-      GenerateFeatureFlag("gestureediting", enable_gesture_editing));
+  // TODO(https://crbug.com/890134): Implement gesture editing.
+  features->AppendString(GenerateFeatureFlag("gestureediting", false));
   features->AppendString(GenerateFeatureFlag(
       "fullscreenhandwriting",
       base::FeatureList::IsEnabled(
           features::kEnableFullscreenHandwritingVirtualKeyboard)));
-  features->AppendString(GenerateFeatureFlag(
-      "virtualkeyboardmdui",
-      base::FeatureList::IsEnabled(features::kEnableVirtualKeyboardMdUi)));
   features->AppendString(GenerateFeatureFlag(
       "imeservice", base::FeatureList::IsEnabled(
                         chromeos::features::kImeServiceConnectable)));

chrome/browser/flag_descriptions.cc

@@ -3346,11 +3346,6 @@ const char kEnableEncryptionMigrationDescription[] =
     "If enabled and the device supports ARC, the user will be asked to update "
     "the encryption of user data when the user signs in.";
 
-const char kEnableFloatingVirtualKeyboardName[] =
-    "Enable floating virtual keyboard";
-const char kEnableFloatingVirtualKeyboardDescription[] =
-    "If enabled, the keyboard will use floating behavior by default.";
-
 const char kEnableFullscreenHandwritingVirtualKeyboardName[] =
     "Enable full screen handwriting virtual keyboard";
 const char kEnableFullscreenHandwritingVirtualKeyboardDescription[] =
@@ -3422,11 +3417,6 @@ const char kEnableUnifiedMultiDeviceSetupName[] =
 const char kEnableUnifiedMultiDeviceSetupDescription[] =
     "Enable the device to setup all MultiDevice services in a single workflow.";
 
-const char kEnableVirtualKeyboardMdUiName[] =
-    "Enable Material Design virtual keyboard";
-const char kEnableVirtualKeyboardMdUiDescription[] =
-    "If enabled, loads the Material Design UI for the virtual keyboard.";
-
 const char kEnableVirtualKeyboardUkmName[] = "Enable UKM for virtual keyboard";
 const char kEnableVirtualKeyboardUkmDescription[] =
     "Enables UKM for virtual keyboard";

chrome/browser/flag_descriptions.h

@@ -2022,9 +2022,6 @@ extern const char kEnableEhvInputDescription[];
 extern const char kEnableEncryptionMigrationName[];
 extern const char kEnableEncryptionMigrationDescription[];
 
-extern const char kEnableFloatingVirtualKeyboardName[];
-extern const char kEnableFloatingVirtualKeyboardDescription[];
-
 extern const char kEnableFullscreenHandwritingVirtualKeyboardName[];
 extern const char kEnableFullscreenHandwritingVirtualKeyboardDescription[];
 
@@ -2067,9 +2064,6 @@ extern const char kEnableUnifiedMultiDeviceSettingsDescription[];
 extern const char kEnableUnifiedMultiDeviceSetupName[];
 extern const char kEnableUnifiedMultiDeviceSetupDescription[];
 
-extern const char kEnableVirtualKeyboardMdUiName[];
-extern const char kEnableVirtualKeyboardMdUiDescription[];
-
 extern const char kEnableVirtualKeyboardUkmName[];
 extern const char kEnableVirtualKeyboardUkmDescription[];
 

chrome/browser/ui/ash/chrome_keyboard_web_contents.cc

@@ -147,19 +147,11 @@ ChromeKeyboardWebContents::ChromeKeyboardWebContents(
   aura::Window* keyboard_window = web_contents_->GetNativeView();
   keyboard_window->set_owned_by_parent(false);
 
-  // Only use transparent background when fullscreen handwriting or the new UI
-  // is enabled. The old UI sometimes reloads itself, which will cause the
-  // keyboard to be see-through.
-  // TODO(https://crbug.com/840731): Find a permanent fix for this on the
-  // keyboard extension side.
-  if (base::FeatureList::IsEnabled(
-          features::kEnableFullscreenHandwritingVirtualKeyboard) ||
-      base::FeatureList::IsEnabled(features::kEnableVirtualKeyboardMdUi)) {
-    content::RenderWidgetHostView* view =
-        web_contents_->GetMainFrame()->GetView();
-    view->SetBackgroundColor(SK_ColorTRANSPARENT);
-    view->GetNativeView()->SetTransparent(true);
-  }
+  // Set the background to be transparent for custom keyboard window shape.
+  content::RenderWidgetHostView* view =
+      web_contents_->GetMainFrame()->GetView();
+  view->SetBackgroundColor(SK_ColorTRANSPARENT);
+  view->GetNativeView()->SetTransparent(true);
 
   // By default, layers in WebContents are clipped at the window bounds,
   // but this causes the shadows to be clipped too, so clipping needs to

ui/base/ui_base_features.cc

@@ -28,10 +28,6 @@ const base::Feature kEnableEmojiContextMenu {
 #endif
 };
 
-// Enables the floating virtual keyboard behavior.
-const base::Feature kEnableFloatingVirtualKeyboard = {
-    "enable-floating-virtual-keyboard", base::FEATURE_ENABLED_BY_DEFAULT};
-
 // Enables the full screen handwriting virtual keyboard behavior.
 const base::Feature kEnableFullscreenHandwritingVirtualKeyboard = {
     "enable-fullscreen-handwriting-virtual-keyboard",
@@ -40,10 +36,6 @@ const base::Feature kEnableFullscreenHandwritingVirtualKeyboard = {
 const base::Feature kEnableStylusVirtualKeyboard = {
     "enable-stylus-virtual-keyboard", base::FEATURE_ENABLED_BY_DEFAULT};
 
-// If enabled, uses the Material Design UI for virtual keyboard.
-const base::Feature kEnableVirtualKeyboardMdUi = {
-    "EnableVirtualKeyboardMdUi", base::FEATURE_ENABLED_BY_DEFAULT};
-
 const base::Feature kEnableVirtualKeyboardUkm = {
     "EnableVirtualKeyboardUkm", base::FEATURE_ENABLED_BY_DEFAULT};
 

ui/base/ui_base_features.h

@@ -14,11 +14,9 @@ namespace features {
 
 // Keep sorted!
 UI_BASE_EXPORT extern const base::Feature kEnableEmojiContextMenu;
-UI_BASE_EXPORT extern const base::Feature kEnableFloatingVirtualKeyboard;
 UI_BASE_EXPORT extern const base::Feature
     kEnableFullscreenHandwritingVirtualKeyboard;
 UI_BASE_EXPORT extern const base::Feature kEnableStylusVirtualKeyboard;
-UI_BASE_EXPORT extern const base::Feature kEnableVirtualKeyboardMdUi;
 UI_BASE_EXPORT extern const base::Feature kEnableVirtualKeyboardUkm;
 UI_BASE_EXPORT extern const base::Feature kExperimentalUi;
 UI_BASE_EXPORT extern const base::Feature kSystemKeyboardLock;

ui/keyboard/public/keyboard_switches.h

@@ -27,12 +27,6 @@ KEYBOARD_EXPORT extern const char kDisableGestureEditing[];
 // Enables the virtual keyboard.
 KEYBOARD_EXPORT extern const char kEnableVirtualKeyboard[];
 
-// Floating virtual keyboard flag.
-KEYBOARD_EXPORT extern const char kEnableFloatingVirtualKeyboard[];
-
-// Virtual keyboard material design UI flag.
-KEYBOARD_EXPORT extern const char kEnableVirtualKeyboardMdUi[];
-
 // Disabled overscrolling of web content when the virtual keyboard is displayed.
 // If disabled, the work area is resized to restrict windows from overlapping
 // with the keybaord area.