Turns on smart deployment of the virtual keyboard by default, and changes the flag to allow easy di…

ash/virtual_keyboard_controller.cc

Index: ash/virtual_keyboard_controller.cc
diff --git a/ash/virtual_keyboard_controller.cc b/ash/virtual_keyboard_controller.cc
index 18050cb1b43e1a48d41dad40ea924eac902193dd..418679f7272285ea6cbad2fbca60b3296ea3bb0e 100644
--- a/ash/virtual_keyboard_controller.cc
+++ b/ash/virtual_keyboard_controller.cc
@@ -36,15 +36,15 @@ VirtualKeyboardController::~VirtualKeyboardController() {
 }
 
 void VirtualKeyboardController::OnMaximizeModeStarted() {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          keyboard::switches::kAutoVirtualKeyboard)) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          keyboard::switches::kDisableSmartVirtualKeyboard)) {

[sky, 2014/12/13 00:12:24]

Can we have this check in one place and not three?

[rsadam, 2014/12/13 00:35:27]

Done.

     SetKeyboardEnabled(true);
   }
 }
 
 void VirtualKeyboardController::OnMaximizeModeEnded() {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          keyboard::switches::kAutoVirtualKeyboard)) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          keyboard::switches::kDisableSmartVirtualKeyboard)) {
     SetKeyboardEnabled(false);
   }
 }
@@ -87,8 +87,8 @@ void VirtualKeyboardController::UpdateDevices() {
 }
 
 void VirtualKeyboardController::UpdateKeyboardEnabled() {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          keyboard::switches::kAutoVirtualKeyboard)) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          keyboard::switches::kDisableSmartVirtualKeyboard)) {
     SetKeyboardEnabled(Shell::GetInstance()
                            ->maximize_mode_controller()
                            ->IsMaximizeModeWindowManagerEnabled());