| Index: ash/BUILD.gn
 | 
| diff --git a/ash/BUILD.gn b/ash/BUILD.gn
 | 
| index 89d2f20a2f3966ede88328fa7163134ac7e9911c..bfcd732ce98a60522d15b622117d8196b2385c8d 100644
 | 
| --- a/ash/BUILD.gn
 | 
| +++ b/ash/BUILD.gn
 | 
| @@ -665,23 +665,6 @@ component("ash") {
 | 
|      "wm/lock_state_observer.h",
 | 
|      "wm/lock_window_state.cc",
 | 
|      "wm/lock_window_state.h",
 | 
| -    "wm/maximize_mode/maximize_mode_backdrop_delegate_impl.cc",
 | 
| -    "wm/maximize_mode/maximize_mode_backdrop_delegate_impl.h",
 | 
| -    "wm/maximize_mode/maximize_mode_controller.cc",
 | 
| -    "wm/maximize_mode/maximize_mode_controller.h",
 | 
| -    "wm/maximize_mode/maximize_mode_event_handler.cc",
 | 
| -    "wm/maximize_mode/maximize_mode_event_handler.h",
 | 
| -    "wm/maximize_mode/maximize_mode_event_handler_aura.cc",
 | 
| -    "wm/maximize_mode/maximize_mode_event_handler_aura.h",
 | 
| -    "wm/maximize_mode/maximize_mode_window_manager.cc",
 | 
| -    "wm/maximize_mode/maximize_mode_window_manager.h",
 | 
| -    "wm/maximize_mode/maximize_mode_window_state.cc",
 | 
| -    "wm/maximize_mode/maximize_mode_window_state.h",
 | 
| -    "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h",
 | 
| -    "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
 | 
| -    "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
 | 
| -    "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc",
 | 
| -    "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h",
 | 
|      "wm/mru_window_tracker.cc",
 | 
|      "wm/mru_window_tracker.h",
 | 
|      "wm/overlay_event_filter.cc",
 | 
| @@ -745,6 +728,23 @@ component("ash") {
 | 
|      "wm/system_modal_container_layout_manager.h",
 | 
|      "wm/system_wallpaper_controller.cc",
 | 
|      "wm/system_wallpaper_controller.h",
 | 
| +    "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard.h",
 | 
| +    "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
 | 
| +    "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
 | 
| +    "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc",
 | 
| +    "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.h",
 | 
| +    "wm/tablet_mode/tablet_mode_backdrop_delegate_impl.cc",
 | 
| +    "wm/tablet_mode/tablet_mode_backdrop_delegate_impl.h",
 | 
| +    "wm/tablet_mode/tablet_mode_controller.cc",
 | 
| +    "wm/tablet_mode/tablet_mode_controller.h",
 | 
| +    "wm/tablet_mode/tablet_mode_event_handler.cc",
 | 
| +    "wm/tablet_mode/tablet_mode_event_handler.h",
 | 
| +    "wm/tablet_mode/tablet_mode_event_handler_aura.cc",
 | 
| +    "wm/tablet_mode/tablet_mode_event_handler_aura.h",
 | 
| +    "wm/tablet_mode/tablet_mode_window_manager.cc",
 | 
| +    "wm/tablet_mode/tablet_mode_window_manager.h",
 | 
| +    "wm/tablet_mode/tablet_mode_window_state.cc",
 | 
| +    "wm/tablet_mode/tablet_mode_window_state.h",
 | 
|      "wm/toplevel_window_event_handler.cc",
 | 
|      "wm/toplevel_window_event_handler.h",
 | 
|      "wm/video_detector.cc",
 | 
| @@ -919,8 +919,8 @@ component("ash") {
 | 
|      sources -= [
 | 
|        "host/ash_window_tree_host_x11.cc",
 | 
|        "host/ash_window_tree_host_x11.h",
 | 
| -      "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc",
 | 
| -      "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h",
 | 
| +      "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc",
 | 
| +      "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.h",
 | 
|      ]
 | 
|    }
 | 
|  
 | 
| @@ -932,8 +932,8 @@ component("ash") {
 | 
|      ]
 | 
|    } else {
 | 
|      sources -= [
 | 
| -      "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
 | 
| -      "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
 | 
| +      "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
 | 
| +      "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
 | 
|      ]
 | 
|    }
 | 
|  
 | 
| @@ -1248,8 +1248,6 @@ source_set("common_unittests") {
 | 
|      "wm/container_finder_unittest.cc",
 | 
|      "wm/immersive_fullscreen_controller_unittest.cc",
 | 
|      "wm/lock_state_controller_unittest.cc",
 | 
| -    "wm/maximize_mode/accelerometer_test_data_literals.cc",
 | 
| -    "wm/maximize_mode/maximize_mode_window_manager_unittest.cc",
 | 
|      "wm/mru_window_tracker_unittest.cc",
 | 
|      "wm/overlay_event_filter_unittest.cc",
 | 
|      "wm/overview/cleanup_animation_observer_unittest.cc",
 | 
| @@ -1262,6 +1260,8 @@ source_set("common_unittests") {
 | 
|      "wm/session_state_animator_impl_unittest.cc",
 | 
|      "wm/stacking_controller_unittest.cc",
 | 
|      "wm/system_modal_container_layout_manager_unittest.cc",
 | 
| +    "wm/tablet_mode/accelerometer_test_data_literals.cc",
 | 
| +    "wm/tablet_mode/tablet_mode_window_manager_unittest.cc",
 | 
|      "wm/toplevel_window_event_handler_unittest.cc",
 | 
|      "wm/video_detector_unittest.cc",
 | 
|      "wm/window_animations_unittest.cc",
 | 
| @@ -1401,7 +1401,7 @@ test("ash_unittests") {
 | 
|      "wm/lock_layout_manager_unittest.cc",
 | 
|  
 | 
|      # TODO: investigate failures in mash. http://crbug.com/698092.
 | 
| -    "wm/maximize_mode/maximize_mode_controller_unittest.cc",
 | 
| +    "wm/tablet_mode/tablet_mode_controller_unittest.cc",
 | 
|  
 | 
|      # TODO: mash doesn't support CursorManager. http://crbug.com/631103.
 | 
|      "wm/resize_shadow_and_cursor_unittest.cc",
 | 
| 
 |