| Index: ash/mus/bridge/shell_port_mash.cc
|
| diff --git a/ash/mus/bridge/shell_port_mash.cc b/ash/mus/bridge/shell_port_mash.cc
|
| index 61c964633d1219e855f00b432ed5d6a415dc0e67..1ee218f48b7fc6829b43f7302532effa12efd434 100644
|
| --- a/ash/mus/bridge/shell_port_mash.cc
|
| +++ b/ash/mus/bridge/shell_port_mash.cc
|
| @@ -40,11 +40,11 @@
|
| #include "ash/virtual_keyboard_controller.h"
|
| #include "ash/wallpaper/wallpaper_delegate.h"
|
| #include "ash/wm/drag_window_resizer.h"
|
| +#include "ash/wm/maximize_mode/maximize_mode_event_handler.h"
|
| +#include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
|
| +#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
|
| +#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h"
|
| #include "ash/wm/mru_window_tracker.h"
|
| -#include "ash/wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard.h"
|
| -#include "ash/wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h"
|
| -#include "ash/wm/tablet_mode/tablet_mode_event_handler.h"
|
| -#include "ash/wm/tablet_mode/tablet_mode_event_handler_aura.h"
|
| #include "ash/wm/window_cycle_event_filter.h"
|
| #include "ash/wm/window_cycle_event_filter_aura.h"
|
| #include "ash/wm/window_resizer.h"
|
| @@ -368,10 +368,10 @@
|
| return nullptr;
|
| }
|
|
|
| -std::unique_ptr<wm::TabletModeEventHandler>
|
| -ShellPortMash::CreateTabletModeEventHandler() {
|
| - if (GetAshConfig() == Config::MUS)
|
| - return base::MakeUnique<wm::TabletModeEventHandlerAura>();
|
| +std::unique_ptr<wm::MaximizeModeEventHandler>
|
| +ShellPortMash::CreateMaximizeModeEventHandler() {
|
| + if (GetAshConfig() == Config::MUS)
|
| + return base::MakeUnique<wm::MaximizeModeEventHandlerAura>();
|
|
|
| // TODO: need support for window manager to get events before client:
|
| // http://crbug.com/624157.
|
|
|