Chromium Code Reviews| Index: ui/display/chromeos/display_configurator.h |
| diff --git a/ui/display/chromeos/display_configurator.h b/ui/display/chromeos/display_configurator.h |
| index 5a2b2d482f588ac404a1df659eeeef9d4ce54131..b1fc588797ea8348f99215c4bd2727b651fbcf2d 100644 |
| --- a/ui/display/chromeos/display_configurator.h |
| +++ b/ui/display/chromeos/display_configurator.h |
| @@ -14,10 +14,12 @@ |
| #include "base/event_types.h" |
| #include "base/memory/scoped_ptr.h" |
| +#include "base/memory/scoped_vector.h" |
| #include "base/memory/weak_ptr.h" |
| #include "base/observer_list.h" |
| #include "base/timer/timer.h" |
| #include "third_party/cros_system_api/dbus/service_constants.h" |
| +#include "ui/display/chromeos/display_snapshot_virtual.h" |
| #include "ui/display/chromeos/query_content_protection_task.h" |
| #include "ui/display/display_export.h" |
| #include "ui/display/types/display_constants.h" |
| @@ -269,6 +271,10 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver { |
| bool SetGammaRamp(int64_t display_id, |
| const std::vector<GammaRampRGBEntry>& lut); |
| + // Enables/disables virtual display. |
| + int64_t AddVirtualDisplay(gfx::Size display_size); |
| + bool RemoveVirtualDisplay(int64_t display_id); |
| + |
| private: |
| class DisplayLayoutManagerImpl; |
| @@ -421,6 +427,12 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver { |
| // Whether the displays are currently suspended. |
| bool displays_suspended_; |
| + // Virtual display control. |
| + ScopedVector<DisplaySnapshot> virtual_display_snapshots_; |
| + |
| + // Last used virtual display id. |
| + int64_t last_virtual_display_id_ = 0; |
|
oshima
2015/11/24 22:19:27
Can you factor out GetID in ui/display/util/edid_p
robert.bradford
2015/11/26 16:29:40
Ah, that's a great solution. I wasn't very happy w
|
| + |
| scoped_ptr<DisplayLayoutManager> layout_manager_; |
| scoped_ptr<UpdateDisplayConfigurationTask> configuration_task_; |