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 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 #endif | 255 #endif |
| 256 bool software_mirroring_enabled() const { | 256 virtual bool software_mirroring_enabled() const { |
|
Daniel Erat
2014/05/15 14:04:25
making an accessor virtual seems strange...
kcwu1
2014/05/15 15:02:42
If not, how do you suggest to expose this method f
dnicoara
2014/05/15 19:38:48
I think the confusion comes from the fact that the
kcwu
2014/05/16 04:36:39
Done.
It should not be in #ifdef because it is als
| |
| 257 return second_display_mode_ == MIRRORING; | 257 return second_display_mode_ == MIRRORING; |
| 258 }; | 258 }; |
| 259 | 259 |
| 260 bool virtual_keyboard_root_window_enabled() const { | 260 bool virtual_keyboard_root_window_enabled() const { |
| 261 return second_display_mode_ == VIRTUAL_KEYBOARD; | 261 return second_display_mode_ == VIRTUAL_KEYBOARD; |
| 262 }; | 262 }; |
| 263 | 263 |
| 264 // Sets/gets second display mode. | 264 // Sets/gets second display mode. |
| 265 void SetSecondDisplayMode(SecondDisplayMode mode); | 265 void SetSecondDisplayMode(SecondDisplayMode mode); |
| 266 SecondDisplayMode second_display_mode() const { | 266 SecondDisplayMode second_display_mode() const { |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 360 SecondDisplayMode second_display_mode_; | 360 SecondDisplayMode second_display_mode_; |
| 361 int64 mirrored_display_id_; | 361 int64 mirrored_display_id_; |
| 362 gfx::Display non_desktop_display_; | 362 gfx::Display non_desktop_display_; |
| 363 | 363 |
| 364 DISALLOW_COPY_AND_ASSIGN(DisplayManager); | 364 DISALLOW_COPY_AND_ASSIGN(DisplayManager); |
| 365 }; | 365 }; |
| 366 | 366 |
| 367 } // namespace ash | 367 } // namespace ash |
| 368 | 368 |
| 369 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ | 369 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ |
| OLD | NEW |