(fix landed) Reland of name MaximizeMode to TabletMode

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/keyboard/keyboard_ui.h"
 #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"
 #include "base/strings/string_util.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/devices/input_device.h"
 #include "ui/events/devices/input_device_manager.h"
 #include "ui/events/devices/touchscreen_device.h"
 #include "ui/keyboard/keyboard_controller.h"
@@ skipping 48 matching lines @@
   Shell::Get()->AddShellObserver(this);
   ui::InputDeviceManager::GetInstance()->AddObserver(this);
   UpdateDevices();
 }
 
 VirtualKeyboardController::~VirtualKeyboardController() {
   Shell::Get()->RemoveShellObserver(this);
   ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
 }
 
-void VirtualKeyboardController::OnMaximizeModeStarted() {
+void VirtualKeyboardController::OnTabletModeStarted() {
   if (!IsSmartVirtualKeyboardEnabled()) {
     SetKeyboardEnabled(true);
   } else {
     UpdateKeyboardEnabled();
   }
 }
 
-void VirtualKeyboardController::OnMaximizeModeEnded() {
+void VirtualKeyboardController::OnTabletModeEnded() {
   if (!IsSmartVirtualKeyboardEnabled()) {
     SetKeyboardEnabled(false);
   } else {
     UpdateKeyboardEnabled();
   }
 }
 
 void VirtualKeyboardController::OnTouchscreenDeviceConfigurationChanged() {
   UpdateDevices();
 }
@@ skipping 74 matching lines @@
     if (type == ui::InputDeviceType::INPUT_DEVICE_EXTERNAL)
       has_external_keyboard_ = true;
   }
   // Update keyboard state.
   UpdateKeyboardEnabled();
 }
 
 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_ &&
                      (!has_external_keyboard_ || ignore_external_keyboard_));
   Shell::Get()->system_tray_notifier()->NotifyVirtualKeyboardSuppressionChanged(
       !is_internal_keyboard_active && has_touchscreen_ &&
       has_external_keyboard_);
 }
 
 void VirtualKeyboardController::SetKeyboardEnabled(bool enabled) {
   bool was_enabled = keyboard::IsKeyboardEnabled();
   keyboard::SetTouchKeyboardEnabled(enabled);
   bool is_enabled = keyboard::IsKeyboardEnabled();
   if (is_enabled == was_enabled)
     return;
   if (is_enabled) {
     Shell::Get()->CreateKeyboard();
   } else {
     Shell::Get()->DeactivateKeyboard();
   }
 }
 
 }  // namespace ash