(fix landed) Reland of name MaximizeMode to TabletMode

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 2d1443c945c7fb20385958a55ac0c811cc265940..d13dffb9ca4e63ef88689477cf98d3a9a9c9b00a 100644
--- a/ash/virtual_keyboard_controller.cc
+++ b/ash/virtual_keyboard_controller.cc
@@ -10,7 +10,7 @@
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_notifier.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/wm/tablet_mode/tablet_mode_controller.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm_window.h"
 #include "base/command_line.h"
@@ -79,7 +79,7 @@
   ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
 }
 
-void VirtualKeyboardController::OnMaximizeModeStarted() {
+void VirtualKeyboardController::OnTabletModeStarted() {
   if (!IsSmartVirtualKeyboardEnabled()) {
     SetKeyboardEnabled(true);
   } else {
@@ -87,7 +87,7 @@
   }
 }
 
-void VirtualKeyboardController::OnMaximizeModeEnded() {
+void VirtualKeyboardController::OnTabletModeEnded() {
   if (!IsSmartVirtualKeyboardEnabled()) {
     SetKeyboardEnabled(false);
   } else {
@@ -182,13 +182,13 @@
 void VirtualKeyboardController::UpdateKeyboardEnabled() {
   if (!IsSmartVirtualKeyboardEnabled()) {
     SetKeyboardEnabled(Shell::Get()
-                           ->maximize_mode_controller()
-                           ->IsMaximizeModeWindowManagerEnabled());
+                           ->tablet_mode_controller()
+                           ->IsTabletModeWindowManagerEnabled());
     return;
   }
   bool ignore_internal_keyboard = Shell::Get()
-                                      ->maximize_mode_controller()
-                                      ->IsMaximizeModeWindowManagerEnabled();
+                                      ->tablet_mode_controller()
+                                      ->IsTabletModeWindowManagerEnabled();
   bool is_internal_keyboard_active =
       has_internal_keyboard_ && !ignore_internal_keyboard;
   SetKeyboardEnabled(!is_internal_keyboard_active && has_touchscreen_ &&