Index: ash/display/display_manager.h |
diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h |
index 99441fc1c6d62a89cffd6588be644c85b01d3eb1..9dfc0aa2dd54a9c071ed033686fa145f9a1b2fd4 100644 |
--- a/ash/display/display_manager.h |
+++ b/ash/display/display_manager.h |
@@ -14,6 +14,7 @@ |
#include "base/gtest_prod_util.h" |
#include "ui/aura/root_window_observer.h" |
#include "ui/aura/window.h" |
+#include "ui/gfx/display.h" |
namespace gfx { |
class Display; |
@@ -134,7 +135,7 @@ class ASH_EXPORT DisplayManager : public aura::RootWindowObserver { |
// Returns the mirroring status. |
bool IsMirrored() const; |
- int64 mirrored_display_id() const { return mirrored_display_id_; } |
+ int64 mirrored_display_id() const { return mirrored_display_.id(); } |
// Returns the display object nearest given |window|. |
const gfx::Display& GetDisplayNearestPoint( |
@@ -160,10 +161,6 @@ class ASH_EXPORT DisplayManager : public aura::RootWindowObserver { |
// desktop, this returns the first display ID. |
int64 GetDisplayIdForUIScaling() const; |
- // RootWindowObserver overrides: |
- virtual void OnRootWindowResized(const aura::RootWindow* root, |
- const gfx::Size& new_size) OVERRIDE; |
- |
// Change the mirror mode. |
void SetMirrorMode(bool mirrored); |
@@ -172,6 +169,13 @@ class ASH_EXPORT DisplayManager : public aura::RootWindowObserver { |
void AddRemoveDisplay(); |
void ToggleDisplayScaleFactor(); |
+ // RootWindowObserver overrides: |
+ virtual void OnRootWindowResized(const aura::RootWindow* root, |
+ const gfx::Size& new_size) OVERRIDE; |
+ |
+ // TODO(oshima): This will be SoftwareMirroringController override: |
+ void SetSoftwareMirroring(bool enabled); |
+ |
private: |
FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, ConvertPoint); |
FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, TestNativeDisplaysChanged); |
@@ -209,7 +213,7 @@ class ASH_EXPORT DisplayManager : public aura::RootWindowObserver { |
int64 first_display_id_; |
- int64 mirrored_display_id_; |
+ gfx::Display mirrored_display_; |
// List of current active dispays. |
DisplayList displays_; |
@@ -228,6 +232,8 @@ class ASH_EXPORT DisplayManager : public aura::RootWindowObserver { |
// on device as well as during the unit tests. |
bool change_display_upon_host_resize_; |
+ bool software_mirroring_enabled_; |
+ |
DISALLOW_COPY_AND_ASSIGN(DisplayManager); |
}; |