Turns on smart deployment of the virtual keyboard by default, and changes the

flag to allow easy disabling of this feature.

BUG=441814

Review URL: https://codereview.chromium.org/800933002

Cr-Commit-Position: refs/heads/master@{#308373}

ash/system/chromeos/virtual_keyboard/tray_keyboard_lock_unittest.cc

@@ -11,7 +11,6 @@
 #include "ash/test/status_area_widget_test_helper.h"
 #include "ash/test/virtual_keyboard_test_helper.h"
 #include "base/command_line.h"
-#include "ui/keyboard/keyboard_switches.h"
 #include "ui/keyboard/keyboard_util.h"
 
 namespace ash {
@@ -76,8 +75,6 @@ void TrayKeyboardLockTest::TearDownViews() {
 }
 
 void TrayKeyboardLockTest::SetUp() {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      keyboard::switches::kAutoVirtualKeyboard);
   test::AshTestBase::SetUp();
   SetUpForStatusAreaWidget(StatusAreaWidgetTestHelper::GetStatusAreaWidget());
 }

ash/virtual_keyboard_controller.cc

@@ -19,6 +19,15 @@
 #include "ui/keyboard/keyboard_util.h"
 
 namespace ash {
+namespace {
+
+// Checks whether smart deployment is enabled.
+bool IsSmartVirtualKeyboardEnabled() {
+  return !CommandLine::ForCurrentProcess()->HasSwitch(
+      keyboard::switches::kDisableSmartVirtualKeyboard);
+}
+
+}  // namespace
 
 VirtualKeyboardController::VirtualKeyboardController()
     : has_external_keyboard_(false),
@@ -36,17 +45,13 @@ VirtualKeyboardController::~VirtualKeyboardController() {
 }
 
 void VirtualKeyboardController::OnMaximizeModeStarted() {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          keyboard::switches::kAutoVirtualKeyboard)) {
+  if (!IsSmartVirtualKeyboardEnabled())
     SetKeyboardEnabled(true);
-  }
 }
 
 void VirtualKeyboardController::OnMaximizeModeEnded() {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          keyboard::switches::kAutoVirtualKeyboard)) {
+  if (!IsSmartVirtualKeyboardEnabled())
     SetKeyboardEnabled(false);
-  }
 }
 
 void VirtualKeyboardController::OnTouchscreenDeviceConfigurationChanged() {
@@ -87,8 +92,7 @@ void VirtualKeyboardController::UpdateDevices() {
 }
 
 void VirtualKeyboardController::UpdateKeyboardEnabled() {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          keyboard::switches::kAutoVirtualKeyboard)) {
+  if (!IsSmartVirtualKeyboardEnabled()) {
     SetKeyboardEnabled(Shell::GetInstance()
                            ->maximize_mode_controller()
                            ->IsMaximizeModeWindowManagerEnabled());

ash/virtual_keyboard_controller_unittest.cc

@@ -40,6 +40,8 @@ class VirtualKeyboardControllerTest : public AshTestBase {
   }
 
   void SetUp() override {
+    CommandLine::ForCurrentProcess()->AppendSwitch(
+        keyboard::switches::kDisableSmartVirtualKeyboard);
     AshTestBase::SetUp();
     UpdateKeyboardDevices(std::vector<ui::KeyboardDevice>());
     UpdateTouchscreenDevices(std::vector<ui::TouchscreenDevice>());
@@ -70,9 +72,11 @@ class VirtualKeyboardControllerAutoTest : public VirtualKeyboardControllerTest,
   ~VirtualKeyboardControllerAutoTest() override {}
 
   void SetUp() override {
-    CommandLine::ForCurrentProcess()->AppendSwitch(
-        keyboard::switches::kAutoVirtualKeyboard);
-    VirtualKeyboardControllerTest::SetUp();
+    AshTestBase::SetUp();
+    // Set the current list of devices to empty so that they don't interfere
+    // with the test.
+    UpdateKeyboardDevices(std::vector<ui::KeyboardDevice>());
+    UpdateTouchscreenDevices(std::vector<ui::TouchscreenDevice>());
     Shell::GetInstance()->system_tray_notifier()->AddVirtualKeyboardObserver(
         this);
   }

chrome/app/generated_resources.grd

@@ -14121,11 +14121,11 @@ Do you accept?
       </message>
 
       <if expr="chromeos">
-        <message name="IDS_FLAGS_AUTO_VIRTUAL_KEYBOARD_NAME" desc="Name of about:flags option to turn on automatic deployment of the virtual keyboard.">
-          Auto Virtual Keyboard
+        <message name="IDS_FLAGS_DISABLE_SMART_VIRTUAL_KEYBOARD_NAME" desc="Name of about:flags option to turn off smart deployment of the virtual keyboard.">
+          Disable Smart Virtual Keyboard
         </message>
-        <message name="IDS_FLAGS_AUTO_VIRTUAL_KEYBOARD_DESCRIPTION" desc="Description of about:flags option to turn on automatic deployment of the virtual keyboard">
-          Enable automatic deployment of the virtual keyboard.
+        <message name="IDS_FLAGS_DISABLE_SMART_VIRTUAL_KEYBOARD_DESCRIPTION" desc="Description of about:flags option to turn off smart deployment of the virtual keyboard">
+          Disable smart deployment of the virtual keyboard.
         </message>
 
         <message name="IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME" desc="Name of about:flags option to turn on the virtual keyboard">

chrome/browser/about_flags.cc

@@ -1271,11 +1271,11 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(keyboard::switches::kEnableExperimentalInputViewFeatures)
   },
   {
-    "auto-virtual-keyboard",
-    IDS_FLAGS_AUTO_VIRTUAL_KEYBOARD_NAME,
-    IDS_FLAGS_AUTO_VIRTUAL_KEYBOARD_DESCRIPTION,
+    "disable-smart-virtual-keyboard",
+    IDS_FLAGS_DISABLE_SMART_VIRTUAL_KEYBOARD_NAME,
+    IDS_FLAGS_DISABLE_SMART_VIRTUAL_KEYBOARD_DESCRIPTION,
     kOsCrOS,
-    SINGLE_VALUE_TYPE(keyboard::switches::kAutoVirtualKeyboard)
+    SINGLE_VALUE_TYPE(keyboard::switches::kDisableSmartVirtualKeyboard)
   },
 #endif
   {

tools/metrics/histograms/histograms.xml

@@ -49620,6 +49620,7 @@ To add a new entry, add it with any value and run test to compute valid value.
   <int value="1163255347" label="ash-enable-touch-view-touch-feedback"/>
   <int value="1181056275" label="enable-cloud-backup"/>
   <int value="1196644408" label="performance-monitor-gathering"/>
+  <int value="1196834473" label="disable-smart-virtual-keyboard"/>
   <int value="1205849612" label="enable-sync-synced-notifications"/>
   <int value="1210343926" label="enable-drop-sync-credential"/>
   <int value="1220464509" label="enable-first-run-ui-transitions"/>

ui/keyboard/keyboard_switches.cc

@@ -15,7 +15,7 @@ const char kEnableExperimentalInputViewFeatures[] =
     "enable-experimental-input-view-features";
 
 const char kEnableVirtualKeyboard[] = "enable-virtual-keyboard";
-const char kAutoVirtualKeyboard[] = "auto-virtual-keyboard";
+const char kDisableSmartVirtualKeyboard[] = "disable-smart-virtual-keyboard";
 
 const char kDisableVirtualKeyboardOverscroll[] =
     "disable-virtual-keyboard-overscroll";

ui/keyboard/keyboard_switches.h

@@ -36,9 +36,9 @@ KEYBOARD_EXPORT extern const char kDisableVirtualKeyboardOverscroll[];
 // to provide access to content that would otherwise be occluded.
 KEYBOARD_EXPORT extern const char kEnableVirtualKeyboardOverscroll[];
 
-// Enable automatic showing/hiding of the keyboard based on the devices plugged
+// Disable automatic showing/hiding of the keyboard based on the devices plugged
 // in.
-KEYBOARD_EXPORT extern const char kAutoVirtualKeyboard[];
+KEYBOARD_EXPORT extern const char kDisableSmartVirtualKeyboard[];
 
 }  // namespace switches
 }  // namespace keyboard