2nd try

* Use DisplayManager::IsMirrored to check mirroring state
* Split CycleDisplay shortcut into AddRemoveDisplay and ToggleMirrorMode
* A few minor cleanups that will make it easy to implement
  compositor based mirroing.

BUG=239776
TEST=none no functional change.
R=jamescook@chromium.org, mukai@chromium.org, sky@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=200208

Review URL: https://chromiumcodereview.appspot.com/15094002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200453 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 7 deletions

diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h
index ffd4e18..e75a797 100644
--- a/ash/display/display_manager.h
+++ b/ash/display/display_manager.h
@@ -39,11 +39,6 @@ class ASH_EXPORT DisplayManager : public aura::RootWindowObserver {
   DisplayManager();
   virtual ~DisplayManager();
 
-  // Used to emulate display change when run in a desktop environment instead
-  // of on a device.
-  static void CycleDisplay();
-  static void ToggleDisplayScaleFactor();
-
   // Returns next valid UI scale.
   static float GetNextUIScale(const DisplayInfo& info, bool up);
 
@@ -166,6 +161,14 @@ class ASH_EXPORT DisplayManager : public aura::RootWindowObserver {
   virtual void OnRootWindowResized(const aura::RootWindow* root,
                                    const gfx::Size& new_size) OVERRIDE;
 
+  // Change the mirror mode.
+  void SetMirrorMode(bool mirrored);
+
+  // Used to emulate display change when run in a desktop environment instead
+  // of on a device.
+  void AddRemoveDisplay();
+  void ToggleDisplayScaleFactor();
+
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, ConvertPoint);
   FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, TestNativeDisplaysChanged);
@@ -184,8 +187,6 @@ class ASH_EXPORT DisplayManager : public aura::RootWindowObserver {
   }
 
   void Init();
-  void CycleDisplayImpl();
-  void ScaleDisplayImpl();
 
   gfx::Display& FindDisplayForRootWindow(const aura::RootWindow* root);
   gfx::Display& FindDisplayForId(int64 id);