Index: components/exo/wm_helper_ash.cc |
diff --git a/components/exo/wm_helper_ash.cc b/components/exo/wm_helper_ash.cc |
index e4b96bfd6ba09d42d6235e93ed9f3eceea341209..47b45079b6211a8f11329dac2767593f451f2221 100644 |
--- a/components/exo/wm_helper_ash.cc |
+++ b/components/exo/wm_helper_ash.cc |
@@ -8,7 +8,7 @@ |
#include "ash/shell.h" |
#include "ash/shell_port.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 "base/memory/singleton.h" |
#include "ui/aura/client/focus_client.h" |
#include "ui/display/manager/display_manager.h" |
@@ -100,10 +100,10 @@ void WMHelperAsh::RemovePostTargetHandler(ui::EventHandler* handler) { |
ash::Shell::Get()->RemovePostTargetHandler(handler); |
} |
-bool WMHelperAsh::IsMaximizeModeWindowManagerEnabled() const { |
+bool WMHelperAsh::IsTabletModeWindowManagerEnabled() const { |
return ash::Shell::Get() |
- ->maximize_mode_controller() |
- ->IsMaximizeModeWindowManagerEnabled(); |
+ ->tablet_mode_controller() |
+ ->IsTabletModeWindowManagerEnabled(); |
} |
void WMHelperAsh::OnWindowActivated( |
@@ -126,16 +126,16 @@ void WMHelperAsh::OnCursorSetChanged(ui::CursorSetType cursor_set) { |
NotifyCursorSetChanged(cursor_set); |
} |
-void WMHelperAsh::OnMaximizeModeStarted() { |
- NotifyMaximizeModeStarted(); |
+void WMHelperAsh::OnTabletModeStarted() { |
+ NotifyTabletModeStarted(); |
} |
-void WMHelperAsh::OnMaximizeModeEnding() { |
- NotifyMaximizeModeEnding(); |
+void WMHelperAsh::OnTabletModeEnding() { |
+ NotifyTabletModeEnding(); |
} |
-void WMHelperAsh::OnMaximizeModeEnded() { |
- NotifyMaximizeModeEnded(); |
+void WMHelperAsh::OnTabletModeEnded() { |
+ NotifyTabletModeEnded(); |
} |
void WMHelperAsh::OnDisplayConfigurationChanged() { |