| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef ASH_CONTENT_DISPLAY_SCREEN_ORIENTATION_CONTROLLER_CHROMEOS_H_ | 5 #ifndef ASH_CONTENT_DISPLAY_SCREEN_ORIENTATION_CONTROLLER_CHROMEOS_H_ |
| 6 #define ASH_CONTENT_DISPLAY_SCREEN_ORIENTATION_CONTROLLER_CHROMEOS_H_ | 6 #define ASH_CONTENT_DISPLAY_SCREEN_ORIENTATION_CONTROLLER_CHROMEOS_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 | 172 |
| 173 // The rotation of the display set by the user. This rotation will be | 173 // The rotation of the display set by the user. This rotation will be |
| 174 // restored upon exiting maximize mode. | 174 // restored upon exiting maximize mode. |
| 175 gfx::Display::Rotation user_rotation_; | 175 gfx::Display::Rotation user_rotation_; |
| 176 | 176 |
| 177 // The current rotation set by ScreenOrientationController for the internal | 177 // The current rotation set by ScreenOrientationController for the internal |
| 178 // display. | 178 // display. |
| 179 gfx::Display::Rotation current_rotation_; | 179 gfx::Display::Rotation current_rotation_; |
| 180 | 180 |
| 181 // Rotation Lock observers. | 181 // Rotation Lock observers. |
| 182 ObserverList<Observer> observers_; | 182 base::ObserverList<Observer> observers_; |
| 183 | 183 |
| 184 // Tracks all windows that have requested a lock, as well as the requested | 184 // Tracks all windows that have requested a lock, as well as the requested |
| 185 // orientation. | 185 // orientation. |
| 186 std::map<aura::Window*, blink::WebScreenOrientationLockType> locking_windows_; | 186 std::map<aura::Window*, blink::WebScreenOrientationLockType> locking_windows_; |
| 187 | 187 |
| 188 DISALLOW_COPY_AND_ASSIGN(ScreenOrientationController); | 188 DISALLOW_COPY_AND_ASSIGN(ScreenOrientationController); |
| 189 }; | 189 }; |
| 190 | 190 |
| 191 } // namespace ash | 191 } // namespace ash |
| 192 | 192 |
| 193 #endif // ASH_CONTENT_DISPLAY_SCREEN_ORIENTATION_CONTROLLER_CHROMEOS_H_ | 193 #endif // ASH_CONTENT_DISPLAY_SCREEN_ORIENTATION_CONTROLLER_CHROMEOS_H_ |
| OLD | NEW |