diff options
| author | jonross@chromium.org <jonross@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-20 15:23:32 +0000 |
|---|---|---|
| committer | jonross@chromium.org <jonross@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-20 15:25:04 +0000 |
| commit | 62e90d40bc221a4465987938e2089da1bf30e2d1 (patch) | |
| tree | b961f2bc301a4daa766bec58437724c6f38c97ec /ash/shell.cc | |
| parent | fe120441b24c53afc87733c9f533f3bd5fc955ef (diff) | |
| download | chromium_src-62e90d40bc221a4465987938e2089da1bf30e2d1.zip chromium_src-62e90d40bc221a4465987938e2089da1bf30e2d1.tar.gz chromium_src-62e90d40bc221a4465987938e2089da1bf30e2d1.tar.bz2 | |
Rotation Locked saved through device shutdown
Add display rotation preferences to DisplayPreferences. Save the current rotation locked state, along with the screen orientation. These are re-applied upon device reboot, while the device is in maximize mode. Leaving maximize mode clears these settings.
TEST=DisplayPreferencesTest.StoreRotationStateNoLogin, DisplayPreferencesTest.StoreRotationStateGuest, DisplayPreferencesTest.StoreRotationStateNormalUser, DisplayPreferencesTest.LoadRotationNoLogin, DisplayPreferencesTest.LoadRotationIgnoredInNormalMode, DisplayPreferencesTest.RotationLockTriggersSTore
BUG=chrome-os-partner:30681
Review URL: https://codereview.chromium.org/440773005
Cr-Commit-Position: refs/heads/master@{#290842}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 453a008..3889571 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -485,7 +485,8 @@ void Shell::RemoveShellObserver(ShellObserver* observer) { #if defined(OS_CHROMEOS) bool Shell::ShouldSaveDisplaySettings() { return !((maximize_mode_controller_->IsMaximizeModeWindowManagerEnabled() && - maximize_mode_controller_->in_set_screen_rotation()) || + maximize_mode_controller_-> + ignore_display_configuration_updates()) || resolution_notification_controller_->DoesNotificationTimeout()); } #endif |