Index: ui/display/chromeos/display_configurator.h |
diff --git a/ui/display/chromeos/display_configurator.h b/ui/display/chromeos/display_configurator.h |
index c77b96acd7c577321319de331724aa77829e3ab6..9f6689dbeeb2b551109b929c541ab69f518cc607 100644 |
--- a/ui/display/chromeos/display_configurator.h |
+++ b/ui/display/chromeos/display_configurator.h |
@@ -19,9 +19,9 @@ |
#include "third_party/cros_system_api/dbus/service_constants.h" |
#include "ui/display/display_export.h" |
#include "ui/display/types/display_constants.h" |
+#include "ui/display/types/display_mode.h" |
#include "ui/display/types/native_display_observer.h" |
#include "ui/gfx/geometry/size.h" |
- |
namespace gfx { |
class Point; |
class Size; |
@@ -29,7 +29,6 @@ class Size; |
namespace ui { |
struct DisplayConfigureRequest; |
-class DisplayMode; |
class DisplaySnapshot; |
class NativeDisplayDelegate; |
class UpdateDisplayConfigurationTask; |
@@ -285,6 +284,14 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver { |
bool SetColorCalibrationProfile(int64_t display_id, |
ui::ColorCalibrationProfile new_profile); |
+ // Enable/disable virtual output. |
Daniel Erat
2015/02/23 23:14:53
nit: Change to "Enables/disables" to match style o
robert.bradford
2015/03/03 19:58:00
Done.
|
+ void EnableVirtualDisplay(scoped_ptr<DisplayMode> display_mode); |
Daniel Erat
2015/02/23 23:14:53
passing in a DisplayMode seems a bit strange to me
dnicoara
2015/02/24 16:27:06
Same, I think we should just pass in a size and no
robert.bradford
2015/03/03 19:58:00
Done.
|
+ void DisableVirtualDisplay(); |
+ bool IsVirtualDisplayEnabled() const { return virtual_display_mode_.get(); } |
Daniel Erat
2015/02/23 23:14:53
if this is inlined, it should be named like is_vir
robert.bradford
2015/03/03 19:58:00
Done.
|
+ |
+ // Find the virtual display id, returns -1 if none. |
Daniel Erat
2015/02/23 23:14:53
nit: s/Find/Finds/
|
+ int64 GetVirtualDisplayId(); |
dnicoara
2015/02/24 16:27:06
nit: Please use the 'int64_t' variant. This is the
robert.bradford
2015/03/03 19:58:00
Done.
|
+ |
private: |
class DisplayLayoutManagerImpl; |
@@ -417,6 +424,9 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver { |
// Whether the displays are currently suspended. |
bool displays_suspended_; |
+ // Virtual output control. |
+ scoped_ptr<DisplayMode> virtual_display_mode_; |
+ |
scoped_ptr<DisplayLayoutManager> layout_manager_; |
scoped_ptr<UpdateDisplayConfigurationTask> configuration_task_; |