|
Merge Prevent DisplayPreferences from saving incorrect rotations.
Refactor DisplayInfo::rotation_ to track different sources of rotations
Currently DisplayInfo only tracks the active rotation for the given display.
DisplayPreferences however saves a user rotation, as well as an accelerometer
rotation. DisplayController::Observer::OnDisplayConfigurationChanged triggers
the saving of display preferences.
This has been leading to active accelerometer rotations being saved as user
preferences, and being re-applied upon reboot.
This change refactors DisplayInfo to track one rotation per source of rotation
changes. DisplayPreferences has been updated to save based on these states.
TEST=DisplayPreferencesTest.DontSaveMaximizeModeControllerRotations, also ran
ash_unittests, and unit_tests
BUG= chrome-os-partner:37555, 469752, 466861
TBR=oshima@chromium.org, mukai@chromium.org, kalman@chromium.org
NOTRY=true
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1071353003
Cr-Commit-Position: refs/heads/master@{#326614}
(cherry picked from commit d01de7f9b271d29dc1fe9126357a36c5563f0ff0)
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+284 lines, -213 lines) |
Patch |
 |
M |
ash/accelerators/accelerator_controller.cc
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
ash/content/display/screen_orientation_controller_chromeos.h
|
View
|
|
2 chunks |
+7 lines, -3 lines |
0 comments
|
Download
|
 |
M |
ash/content/display/screen_orientation_controller_chromeos.cc
|
View
|
|
10 chunks |
+25 lines, -16 lines |
0 comments
|
Download
|
 |
M |
ash/content/display/screen_orientation_controller_chromeos_unittest.cc
|
View
|
|
22 chunks |
+51 lines, -64 lines |
0 comments
|
Download
|
 |
M |
ash/display/display_controller.cc
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
ash/display/display_controller_unittest.cc
|
View
|
|
5 chunks |
+19 lines, -21 lines |
0 comments
|
Download
|
 |
M |
ash/display/display_info.h
|
View
|
|
4 chunks |
+13 lines, -4 lines |
0 comments
|
Download
|
 |
M |
ash/display/display_info.cc
|
View
|
|
7 chunks |
+23 lines, -7 lines |
0 comments
|
Download
|
 |
M |
ash/display/display_info_unittest.cc
|
View
|
|
1 chunk |
+5 lines, -5 lines |
0 comments
|
Download
|
 |
M |
ash/display/display_manager.h
|
View
|
|
1 chunk |
+5 lines, -2 lines |
0 comments
|
Download
|
 |
M |
ash/display/display_manager.cc
|
View
|
|
3 chunks |
+9 lines, -5 lines |
0 comments
|
Download
|
 |
M |
ash/display/root_window_transformers.cc
|
View
|
|
1 chunk |
+5 lines, -3 lines |
0 comments
|
Download
|
 |
M |
ash/display/root_window_transformers_unittest.cc
|
View
|
|
6 chunks |
+14 lines, -18 lines |
0 comments
|
Download
|
 |
M |
ash/rotator/screen_rotation_animator.h
|
View
|
|
1 chunk |
+4 lines, -2 lines |
0 comments
|
Download
|
 |
M |
ash/rotator/screen_rotation_animator.cc
|
View
|
|
7 chunks |
+10 lines, -8 lines |
0 comments
|
Download
|
 |
M |
ash/system/audio/tray_audio.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
ash/system/chromeos/tray_display.cc
|
View
|
|
3 chunks |
+8 lines, -7 lines |
0 comments
|
Download
|
 |
M |
ash/system/overview/overview_button_tray_unittest.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
ash/test/ash_test_base.h
|
View
|
|
2 chunks |
+7 lines, -0 lines |
0 comments
|
Download
|
 |
M |
ash/test/ash_test_base.cc
|
View
|
|
1 chunk |
+11 lines, -0 lines |
0 comments
|
Download
|
 |
M |
ash/wm/lock_layout_manager_unittest.cc
|
View
|
|
1 chunk |
+4 lines, -2 lines |
0 comments
|
Download
|
 |
M |
ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
|
View
|
|
1 chunk |
+0 lines, -10 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/chromeos/display/display_preferences.cc
|
View
|
|
2 chunks |
+6 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/chromeos/display/display_preferences_unittest.cc
|
View
|
|
12 chunks |
+29 lines, -22 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/display_info_provider_chromeos.cc
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
|
View
|
|
3 chunks |
+6 lines, -3 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/webui/options/chromeos/display_options_handler.cc
|
View
|
|
2 chunks |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
M |
ui/gfx/display.h
|
View
|
|
1 chunk |
+12 lines, -0 lines |
0 comments
|
Download
|
Total messages: 4 (1 generated)
|