Re-enables smart deploy by default.

ash/virtual_keyboard_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/virtual_keyboard_controller.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
@@ skipping 10 matching lines @@
 
 namespace ash {
 namespace {
 
 // Checks whether smart deployment is enabled.
 bool IsSmartVirtualKeyboardEnabled() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           keyboard::switches::kEnableVirtualKeyboard)) {
     return false;
   }
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-      keyboard::switches::kEnableAutoVirtualKeyboard);
+  return !base::CommandLine::ForCurrentProcess()->HasSwitch(
+      keyboard::switches::kDisableSmartVirtualKeyboard);
 }
 
 }  // namespace
 
 VirtualKeyboardController::VirtualKeyboardController()
     : has_external_keyboard_(false),
       has_internal_keyboard_(false),
       has_touchscreen_(false),
       ignore_external_keyboard_(false) {
   Shell::GetInstance()->AddShellObserver(this);
@@ skipping 73 matching lines @@
   keyboard::SetTouchKeyboardEnabled(enabled);
   if (enabled) {
     Shell::GetInstance()->CreateKeyboard();
   } else {
     if (!keyboard::IsKeyboardEnabled())
       Shell::GetInstance()->DeactivateKeyboard();
   }
 }
 
 }  // namespace ash