Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Unified Diff: ash/display/display_manager.h

Issue 15367003: Create a mirror window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win fix Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/display/display_manager.h
diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h
index e75a797c4b269963dc83b658fae634ee741eaa16..f14c3af2b2c3107bd0baf72e4a4a1bdc5911a32a 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;
@@ -131,7 +132,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(
@@ -157,10 +158,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);
@@ -169,6 +166,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);
@@ -206,7 +210,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_;
@@ -225,6 +229,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);
};

Powered by Google App Engine
This is Rietveld 408576698