| Index: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
 | 
| diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
 | 
| index 876e5910982467bcca8f2bc5348d9afdeca5e2c4..722639f6c93acdf9e27aa0ceecd08b7b80607377 100644
 | 
| --- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
 | 
| +++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
 | 
| @@ -10,7 +10,7 @@
 | 
|  #include "ash/shared/app_types.h"
 | 
|  #include "ash/shelf/shelf_model.h"
 | 
|  #include "ash/shell.h"
 | 
| -#include "ash/wm/maximize_mode/maximize_mode_controller.h"
 | 
| +#include "ash/wm/tablet_mode/tablet_mode_controller.h"
 | 
|  #include "ash/wm/window_state.h"
 | 
|  #include "ash/wm/window_util.h"
 | 
|  #include "ash/wm_window.h"
 | 
| @@ -304,8 +304,8 @@ void ArcAppWindowLauncherController::AttachControllerToWindowIfNeeded(
 | 
|    const ash::ShelfID shelf_id(info->app_window()->shelf_id());
 | 
|    window->SetProperty(ash::kShelfIDKey, new std::string(shelf_id.Serialize()));
 | 
|    if (ash::Shell::Get()
 | 
| -          ->maximize_mode_controller()
 | 
| -          ->IsMaximizeModeWindowManagerEnabled()) {
 | 
| +          ->tablet_mode_controller()
 | 
| +          ->IsTabletModeWindowManagerEnabled()) {
 | 
|      SetOrientationLockForAppWindow(info->app_window());
 | 
|    }
 | 
|  }
 | 
| @@ -420,8 +420,8 @@ void ArcAppWindowLauncherController::OnTaskOrientationLockRequested(
 | 
|    }
 | 
|  
 | 
|    if (ash::Shell::Get()
 | 
| -          ->maximize_mode_controller()
 | 
| -          ->IsMaximizeModeWindowManagerEnabled()) {
 | 
| +          ->tablet_mode_controller()
 | 
| +          ->IsTabletModeWindowManagerEnabled()) {
 | 
|      ArcAppWindow* app_window = info->app_window();
 | 
|      if (app_window)
 | 
|        SetOrientationLockForAppWindow(app_window);
 | 
| @@ -500,7 +500,7 @@ void ArcAppWindowLauncherController::OnWindowActivated(
 | 
|    OnTaskSetActive(active_task_id_);
 | 
|  }
 | 
|  
 | 
| -void ArcAppWindowLauncherController::OnMaximizeModeStarted() {
 | 
| +void ArcAppWindowLauncherController::OnTabletModeStarted() {
 | 
|    for (auto& it : task_id_to_app_window_info_) {
 | 
|      ArcAppWindow* app_window = it.second->app_window();
 | 
|      if (app_window)
 | 
| @@ -508,7 +508,7 @@ void ArcAppWindowLauncherController::OnMaximizeModeStarted() {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| -void ArcAppWindowLauncherController::OnMaximizeModeEnded() {
 | 
| +void ArcAppWindowLauncherController::OnTabletModeEnded() {
 | 
|    ash::ScreenOrientationController* orientation_controller =
 | 
|        ash::Shell::Get()->screen_orientation_controller();
 | 
|    // Don't unlock one by one because it'll switch to next rotation.
 | 
| 
 |