Switch primary display

ash/screen_ash.cc

Index: ash/screen_ash.cc
diff --git a/ash/screen_ash.cc b/ash/screen_ash.cc
index 74a6f96f59c79639b6a624d395945bc52ca70aba..e72dfb1705f3525dcbd354fb3296814b5229e20f 100644
--- a/ash/screen_ash.cc
+++ b/ash/screen_ash.cc
@@ -4,6 +4,7 @@
 
 #include "ash/screen_ash.h"
 
+#include "ash/display/display_controller.h"
 #include "ash/display/multi_display_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/coordinate_conversion.h"
@@ -85,6 +86,11 @@ gfx::Rect ScreenAsh::ConvertRectFromScreen(aura::Window* window,
   return gfx::Rect(point, rect.size());
 }
 
+// static
+const gfx::Display& ScreenAsh::GetSecondaryDisplay() {
+  return *(Shell::GetInstance()->display_controller()->GetSecondaryDisplay());
+}
+
 gfx::Point ScreenAsh::GetCursorScreenPoint() {
   return aura::Env::GetInstance()->last_mouse_location();
 }
@@ -111,7 +117,7 @@ gfx::Display ScreenAsh::GetDisplayMatching(const gfx::Rect& match_rect) const {
 }
 
 gfx::Display ScreenAsh::GetPrimaryDisplay() const {
-  return *GetDisplayManager()->GetDisplayAt(0);
+  return Shell::GetInstance()->display_controller()->primary_display();
 }
 
 }  // namespace ash