Switch primary display

ash/screen_ash.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "ash/wm/shelf_layout_manager.h"
 #include "base/logging.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/display_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/gfx/display.h"
@@ skipping 61 matching lines @@
 
 // static
 gfx::Rect ScreenAsh::ConvertRectFromScreen(aura::Window* window,
                                            const gfx::Rect& rect) {
   gfx::Point point = rect.origin();
   aura::client::GetScreenPositionClient(window->GetRootWindow())->
       ConvertPointFromScreen(window, &point);
   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();
 }
 
 gfx::NativeWindow ScreenAsh::GetWindowAtCursorScreenPoint() {
   const gfx::Point point = gfx::Screen::GetCursorScreenPoint();
   return wm::GetRootWindowAt(point)->GetTopWindowContainingPoint(point);
 }
 
 int ScreenAsh::GetNumDisplays() {
   return GetDisplayManager()->GetNumDisplays();
 }
 
 gfx::Display ScreenAsh::GetDisplayNearestWindow(gfx::NativeView window) const {
   return GetDisplayManager()->GetDisplayNearestWindow(window);
 }
 
 gfx::Display ScreenAsh::GetDisplayNearestPoint(const gfx::Point& point) const {
   return GetDisplayManager()->GetDisplayNearestPoint(point);
 }
 
 gfx::Display ScreenAsh::GetDisplayMatching(const gfx::Rect& match_rect) const {
   return GetDisplayManager()->GetDisplayMatching(match_rect);
 }
 
 gfx::Display ScreenAsh::GetPrimaryDisplay() const {
-  return *GetDisplayManager()->GetDisplayAt(0);
+  return Shell::GetInstance()->display_controller()->primary_display();
 }
 
 }  // namespace ash