Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Unified Diff: ash/display/screen_orientation_controller_chromeos.cc

Issue 2906803002: Rename MaximizeMode to TabletMode (Closed)
Patch Set: updated filter Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/display/screen_orientation_controller_chromeos.cc
diff --git a/ash/display/screen_orientation_controller_chromeos.cc b/ash/display/screen_orientation_controller_chromeos.cc
index facaac071b684acb502779616ef51d6db97df367..cba27a9e9211eb03a355dbdde6a31b333611afb3 100644
--- a/ash/display/screen_orientation_controller_chromeos.cc
+++ b/ash/display/screen_orientation_controller_chromeos.cc
@@ -9,8 +9,8 @@
#include "ash/shared/app_types.h"
#include "ash/shell.h"
#include "ash/shell_port.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/wm/mru_window_tracker.h"
+#include "ash/wm/tablet_mode/tablet_mode_controller.h"
#include "ash/wm/window_state.h"
#include "base/auto_reset.h"
#include "base/command_line.h"
@@ -216,8 +216,8 @@ void ScreenOrientationController::UnlockAll() {
bool ScreenOrientationController::ScreenOrientationProviderSupported() const {
return Shell::Get()
- ->maximize_mode_controller()
- ->IsMaximizeModeWindowManagerEnabled();
+ ->tablet_mode_controller()
+ ->IsTabletModeWindowManagerEnabled();
}
void ScreenOrientationController::ToggleUserRotationLock() {
@@ -303,8 +303,8 @@ void ScreenOrientationController::OnDisplayConfigurationChanged() {
}
}
-void ScreenOrientationController::OnMaximizeModeStarted() {
- // Do not exit early, as the internal display can be determined after Maximize
+void ScreenOrientationController::OnTabletModeStarted() {
+ // Do not exit early, as the internal display can be determined after Tablet
// Mode has started. (chrome-os-partner:38796)
// Always start observing.
if (display::Display::HasInternalDisplay()) {
@@ -325,7 +325,7 @@ void ScreenOrientationController::OnMaximizeModeStarted() {
observer.OnUserRotationLockChanged();
}
-void ScreenOrientationController::OnMaximizeModeEnding() {
+void ScreenOrientationController::OnTabletModeEnding() {
chromeos::AccelerometerReader::GetInstance()->RemoveObserver(this);
ShellPort::Get()->RemoveDisplayObserver(this);
if (!display::Display::HasInternalDisplay())

Powered by Google App Engine
This is Rietveld 408576698