Chromium Code Reviews| 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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 245 void SetMirrorMode(bool mirrored); | 245 void SetMirrorMode(bool mirrored); |
| 246 | 246 |
| 247 // Used to emulate display change when run in a desktop environment instead | 247 // Used to emulate display change when run in a desktop environment instead |
| 248 // of on a device. | 248 // of on a device. |
| 249 void AddRemoveDisplay(); | 249 void AddRemoveDisplay(); |
| 250 void ToggleDisplayScaleFactor(); | 250 void ToggleDisplayScaleFactor(); |
| 251 | 251 |
| 252 // SoftwareMirroringController override: | 252 // SoftwareMirroringController override: |
| 253 #if defined(OS_CHROMEOS) | 253 #if defined(OS_CHROMEOS) |
| 254 virtual void SetSoftwareMirroring(bool enabled) OVERRIDE; | 254 virtual void SetSoftwareMirroring(bool enabled) OVERRIDE; |
| 255 virtual bool SoftwareMirroringEnabled() const OVERRIDE { | |
|
dnicoara
2014/05/16 17:42:00
nit: Please move the implementation to the source
kcwu1
2014/05/16 18:18:30
Done.
| |
| 256 return software_mirroring_enabled(); | |
| 257 } | |
| 255 #endif | 258 #endif |
| 256 bool software_mirroring_enabled() const { | 259 bool software_mirroring_enabled() const { |
| 257 return second_display_mode_ == MIRRORING; | 260 return second_display_mode_ == MIRRORING; |
| 258 }; | 261 }; |
| 259 | 262 |
| 260 bool virtual_keyboard_root_window_enabled() const { | 263 bool virtual_keyboard_root_window_enabled() const { |
| 261 return second_display_mode_ == VIRTUAL_KEYBOARD; | 264 return second_display_mode_ == VIRTUAL_KEYBOARD; |
| 262 }; | 265 }; |
| 263 | 266 |
| 264 // Sets/gets second display mode. | 267 // Sets/gets second display mode. |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 360 SecondDisplayMode second_display_mode_; | 363 SecondDisplayMode second_display_mode_; |
| 361 int64 mirrored_display_id_; | 364 int64 mirrored_display_id_; |
| 362 gfx::Display non_desktop_display_; | 365 gfx::Display non_desktop_display_; |
| 363 | 366 |
| 364 DISALLOW_COPY_AND_ASSIGN(DisplayManager); | 367 DISALLOW_COPY_AND_ASSIGN(DisplayManager); |
| 365 }; | 368 }; |
| 366 | 369 |
| 367 } // namespace ash | 370 } // namespace ash |
| 368 | 371 |
| 369 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ | 372 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ |
| OLD | NEW |