Unified Desktop: hook up ash to allow unified desktop mode

ash/display/screen_ash.cc

 // Copyright 2014 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/display/screen_ash.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
@@ skipping 147 matching lines @@
   const RootWindowSettings* rws = GetRootWindowSettings(root_window);
   int64 id = rws->display_id;
   // if id is |kInvaildDisplayID|, it's being deleted.
   DCHECK(id != gfx::Display::kInvalidDisplayID);
   if (id == gfx::Display::kInvalidDisplayID)
     return GetPrimaryDisplay();
 
   DisplayManager* display_manager = GetDisplayManager();
   // RootWindow needs Display to determine its device scale factor
   // for non desktop display.
-  if (display_manager->software_mirroring_display().id() == id)
-    return display_manager->software_mirroring_display();
+  gfx::Display mirroring_display = display_manager->GetMirroringDisplayById(id);
+  if (mirroring_display.is_valid())
+    return mirroring_display;
   return display_manager->GetDisplayForId(id);
 }
 
 gfx::Display ScreenAsh::GetDisplayNearestPoint(const gfx::Point& point) const {
   const gfx::Display& display =
       GetDisplayManager()->FindDisplayContainingPoint(point);
   if (display.is_valid())
     return display;
   // Fallback to the display that has the shortest Manhattan distance from
   // the |point|. This is correct in the only areas that matter, namely in the
@@ skipping 22 matching lines @@
 
 void ScreenAsh::RemoveObserver(gfx::DisplayObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 gfx::Screen* ScreenAsh::CloneForShutdown() {
   return new ScreenForShutdown(this);
 }
 
 }  // namespace ash