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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/screen_orientation_controller_chromeos.cc

Issue 2773013003: Remember User locked rotation (Closed)
Patch Set: . Created 3 years, 9 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
« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | ash/system/chromeos/rotation/tray_rotation_lock.cc » ('j') | ash/system/chromeos/rotation/tray_rotation_lock.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cb6fb4dd3ae5ad0b60563b5614aec2d38f95fff2..1f143805e7e79fb060bb2824e889a320c198c096 100644
--- a/ash/display/screen_orientation_controller_chromeos.cc
+++ b/ash/display/screen_orientation_controller_chromeos.cc
@@ -62,6 +62,95 @@ blink::WebScreenOrientationLockType GetDisplayNaturalOrientation() {
return blink::WebScreenOrientationLockLandscape;
}
+blink::WebScreenOrientationLockType RotationToOrientation(
+ display::Display::Rotation rotation) {
+ blink::WebScreenOrientationLockType natural = GetDisplayNaturalOrientation();
+ if (natural == blink::WebScreenOrientationLockLandscape) {
+ switch (rotation) {
+ case display::Display::ROTATE_0:
+ return blink::WebScreenOrientationLockLandscapePrimary;
+ case display::Display::ROTATE_90:
+ return blink::WebScreenOrientationLockPortraitPrimary;
+ case display::Display::ROTATE_180:
+ return blink::WebScreenOrientationLockLandscapeSecondary;
+ case display::Display::ROTATE_270:
+ return blink::WebScreenOrientationLockPortraitSecondary;
+ }
+ } else { // Natural portrait
+ switch (rotation) {
+ case display::Display::ROTATE_0:
+ return blink::WebScreenOrientationLockPortraitPrimary;
+ case display::Display::ROTATE_90:
+ return blink::WebScreenOrientationLockLandscapePrimary;
+ case display::Display::ROTATE_180:
+ return blink::WebScreenOrientationLockPortraitSecondary;
+ case display::Display::ROTATE_270:
+ return blink::WebScreenOrientationLockLandscapeSecondary;
+ }
+ }
+ NOTREACHED();
+ return blink::WebScreenOrientationLockAny;
+}
+
+// Returns the rotation that matches the orientation type.
+// Returns ROTATE_0 if the given orientation is ANY, which is used
+// to indicate that user didn't lock orientation.
+display::Display::Rotation OrientationToRotation(
+ blink::WebScreenOrientationLockType orientation) {
+ blink::WebScreenOrientationLockType natural = GetDisplayNaturalOrientation();
+ if (orientation == blink::WebScreenOrientationLockAny) {
+ return display::Display::ROTATE_0;
+ }
+
+ if (natural == blink::WebScreenOrientationLockLandscape) {
+ switch (orientation) {
+ case blink::WebScreenOrientationLockLandscapePrimary:
+ return display::Display::ROTATE_0;
+ case blink::WebScreenOrientationLockPortraitPrimary:
+ return display::Display::ROTATE_90;
+ case blink::WebScreenOrientationLockLandscapeSecondary:
+ return display::Display::ROTATE_180;
+ case blink::WebScreenOrientationLockPortraitSecondary:
+ return display::Display::ROTATE_270;
+ default:
+ break;
+ }
+ } else { // Natural portrait
+ switch (orientation) {
+ case blink::WebScreenOrientationLockPortraitPrimary:
+ return display::Display::ROTATE_0;
+ case blink::WebScreenOrientationLockLandscapePrimary:
+ return display::Display::ROTATE_90;
+ case blink::WebScreenOrientationLockPortraitSecondary:
+ return display::Display::ROTATE_180;
+ case blink::WebScreenOrientationLockLandscapeSecondary:
+ return display::Display::ROTATE_270;
+ default:
+ break;
+ }
+ }
+ NOTREACHED() << orientation;
+ return display::Display::ROTATE_0;
+}
+
+// Returns the locked orientation that matches the application
+// requested orientation, or the application orientation itself
+// if it didn't match.
+blink::WebScreenOrientationLockType ResolveOrientationLock(
+ blink::WebScreenOrientationLockType app_requested,
+ blink::WebScreenOrientationLockType lock) {
+ if (app_requested == blink::WebScreenOrientationLockAny ||
+ (app_requested == blink::WebScreenOrientationLockLandscape &&
+ (lock == blink::WebScreenOrientationLockLandscapePrimary ||
+ lock == blink::WebScreenOrientationLockLandscapeSecondary)) ||
+ (app_requested == blink::WebScreenOrientationLockPortrait &&
+ (lock == blink::WebScreenOrientationLockPortraitPrimary ||
+ lock == blink::WebScreenOrientationLockPortraitSecondary))) {
+ return lock;
+ }
+ return app_requested;
+}
+
} // namespace
ScreenOrientationController::ScreenOrientationController()
@@ -131,6 +220,9 @@ bool ScreenOrientationController::ScreenOrientationProviderSupported() const {
}
void ScreenOrientationController::ToggleUserRotationLock() {
+ if (!display::Display::HasInternalDisplay())
+ return;
+
if (user_rotation_locked()) {
user_locked_orientation_ = blink::WebScreenOrientationLockAny;
} else {
@@ -138,48 +230,13 @@ void ScreenOrientationController::ToggleUserRotationLock() {
WmShell::Get()
->GetDisplayInfo(display::Display::InternalDisplayId())
.GetActiveRotation();
- blink::WebScreenOrientationLockType natural =
- GetDisplayNaturalOrientation();
- if (natural == blink::WebScreenOrientationLockLandscape) {
- switch (current_rotation) {
- case display::Display::ROTATE_0:
- user_locked_orientation_ =
- blink::WebScreenOrientationLockLandscapePrimary;
- break;
- case display::Display::ROTATE_90:
- user_locked_orientation_ =
- blink::WebScreenOrientationLockPortraitPrimary;
- break;
- case display::Display::ROTATE_180:
- user_locked_orientation_ =
- blink::WebScreenOrientationLockLandscapeSecondary;
- break;
- case display::Display::ROTATE_270:
- user_locked_orientation_ =
- blink::WebScreenOrientationLockPortraitSecondary;
- break;
- }
- } else { // Natural portrait
- switch (current_rotation) {
- case display::Display::ROTATE_0:
- user_locked_orientation_ =
- blink::WebScreenOrientationLockPortraitPrimary;
- break;
- case display::Display::ROTATE_90:
- user_locked_orientation_ =
- blink::WebScreenOrientationLockLandscapePrimary;
- break;
- case display::Display::ROTATE_180:
- user_locked_orientation_ =
- blink::WebScreenOrientationLockPortraitSecondary;
- break;
- case display::Display::ROTATE_270:
- user_locked_orientation_ =
- blink::WebScreenOrientationLockLandscapeSecondary;
- break;
- }
- }
+ user_locked_orientation_ = RotationToOrientation(current_rotation);
}
+ base::AutoReset<bool> auto_ignore_display_configuration_updates(
+ &ignore_display_configuration_updates_, true);
+ Shell::GetInstance()->display_manager()->RegisterDisplayRotationProperties(
+ user_rotation_locked(), OrientationToRotation(user_locked_orientation_));
+
ApplyLockForActiveWindow();
for (auto& observer : observers_)
@@ -260,13 +317,24 @@ void ScreenOrientationController::OnMaximizeModeStarted() {
LoadDisplayRotationProperties();
chromeos::AccelerometerReader::GetInstance()->AddObserver(this);
WmShell::Get()->AddDisplayObserver(this);
+
+ if (display::Display::HasInternalDisplay()) {
jonross 2017/03/24 16:46:49 Nit: early exit vs blocking off end of method
oshima 2017/03/24 17:19:35 Done.
+ ApplyLockForActiveWindow();
+ for (auto& observer : observers_)
+ observer.OnUserRotationLockChanged();
+ }
}
void ScreenOrientationController::OnMaximizeModeEnded() {
chromeos::AccelerometerReader::GetInstance()->RemoveObserver(this);
WmShell::Get()->RemoveDisplayObserver(this);
- if (current_rotation_ != user_rotation_)
- SetDisplayRotation(user_rotation_, display::Display::ROTATION_SOURCE_USER);
+ if (display::Display::HasInternalDisplay()) {
jonross 2017/03/24 16:46:49 Nit: early exit vs blocking off end of method
oshima 2017/03/24 17:19:35 Done.
+ if (current_rotation_ != user_rotation_)
+ SetDisplayRotation(user_rotation_,
+ display::Display::ROTATION_SOURCE_USER);
+ for (auto& observer : observers_)
+ observer.OnUserRotationLockChanged();
+ }
}
void ScreenOrientationController::SetDisplayRotation(
@@ -289,12 +357,6 @@ void ScreenOrientationController::SetRotationLockedInternal(
rotation_locked_ = rotation_locked;
if (!rotation_locked_)
rotation_locked_orientation_ = blink::WebScreenOrientationLockAny;
- if (!display::Display::HasInternalDisplay())
- return;
- base::AutoReset<bool> auto_ignore_display_configuration_updates(
- &ignore_display_configuration_updates_, true);
- Shell::GetInstance()->display_manager()->RegisterDisplayRotationProperties(
- rotation_locked_, current_rotation_);
}
void ScreenOrientationController::LockRotation(
@@ -444,9 +506,8 @@ void ScreenOrientationController::LoadDisplayRotationProperties() {
Shell::GetInstance()->display_manager();
if (!display_manager->registered_internal_display_rotation_lock())
return;
- SetDisplayRotation(display_manager->registered_internal_display_rotation(),
- display::Display::ROTATION_SOURCE_ACCELEROMETER);
- SetRotationLockedInternal(true);
+ user_locked_orientation_ = RotationToOrientation(
+ display_manager->registered_internal_display_rotation());
}
void ScreenOrientationController::ApplyLockForActiveWindow() {
@@ -456,15 +517,10 @@ void ScreenOrientationController::ApplyLockForActiveWindow() {
for (WmWindow* window : mru_windows) {
if (!window->GetTargetVisibility())
continue;
- // TODO(oshima): If the application's orientation is landscape
- // and user_locked_orientation_ is landscape primary or secondary,
- // it should lock to the specific orientation. (and same for portrait).
for (auto const& pair : locking_windows_) {
if (pair.first->GetTargetVisibility() && window->Contains(pair.first)) {
- LockRotationToOrientation(pair.second ==
- blink::WebScreenOrientationLockAny
- ? user_locked_orientation_
- : pair.second);
+ LockRotationToOrientation(
+ ResolveOrientationLock(pair.second, user_locked_orientation_));
return;
}
}
« no previous file with comments | « ash/display/display_manager_unittest.cc ('k') | ash/system/chromeos/rotation/tray_rotation_lock.cc » ('j') | ash/system/chromeos/rotation/tray_rotation_lock.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698