| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_DISPLAY_DISPLAY_MANAGER_H_ | 5 #ifndef ASH_DISPLAY_DISPLAY_MANAGER_H_ |
| 6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_ | 6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 // Change the mirror mode. | 273 // Change the mirror mode. |
| 274 void SetMirrorMode(bool mirrored); | 274 void SetMirrorMode(bool mirrored); |
| 275 | 275 |
| 276 // Used to emulate display change when run in a desktop environment instead | 276 // Used to emulate display change when run in a desktop environment instead |
| 277 // of on a device. | 277 // of on a device. |
| 278 void AddRemoveDisplay(); | 278 void AddRemoveDisplay(); |
| 279 void ToggleDisplayScaleFactor(); | 279 void ToggleDisplayScaleFactor(); |
| 280 | 280 |
| 281 // SoftwareMirroringController override: | 281 // SoftwareMirroringController override: |
| 282 #if defined(OS_CHROMEOS) | 282 #if defined(OS_CHROMEOS) |
| 283 virtual void SetSoftwareMirroring(bool enabled) OVERRIDE; | 283 virtual void SetSoftwareMirroring(bool enabled) override; |
| 284 virtual bool SoftwareMirroringEnabled() const OVERRIDE; | 284 virtual bool SoftwareMirroringEnabled() const override; |
| 285 #endif | 285 #endif |
| 286 bool software_mirroring_enabled() const { | 286 bool software_mirroring_enabled() const { |
| 287 return second_display_mode_ == MIRRORING; | 287 return second_display_mode_ == MIRRORING; |
| 288 }; | 288 }; |
| 289 | 289 |
| 290 // Sets/gets second display mode. | 290 // Sets/gets second display mode. |
| 291 void SetSecondDisplayMode(SecondDisplayMode mode); | 291 void SetSecondDisplayMode(SecondDisplayMode mode); |
| 292 SecondDisplayMode second_display_mode() const { | 292 SecondDisplayMode second_display_mode() const { |
| 293 return second_display_mode_; | 293 return second_display_mode_; |
| 294 } | 294 } |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 392 | 392 |
| 393 // User preference for the rotation of the internal display. | 393 // User preference for the rotation of the internal display. |
| 394 gfx::Display::Rotation registered_internal_display_rotation_; | 394 gfx::Display::Rotation registered_internal_display_rotation_; |
| 395 | 395 |
| 396 DISALLOW_COPY_AND_ASSIGN(DisplayManager); | 396 DISALLOW_COPY_AND_ASSIGN(DisplayManager); |
| 397 }; | 397 }; |
| 398 | 398 |
| 399 } // namespace ash | 399 } // namespace ash |
| 400 | 400 |
| 401 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ | 401 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ |
| OLD | NEW |