Remove MouseWarpController construction from ash::DisplayManager

ash/display/display_util.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/display_util.h"
 
 #include <algorithm>
 
 #include "ash/common/new_window_delegate.h"
 #include "ash/common/system/system_notifier.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/display_manager.h"
+
+#include "ash/display/extended_mouse_warp_controller.h"
+#include "ash/display/null_mouse_warp_controller.h"
+#include "ash/display/unified_mouse_warp_controller.h"
+
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/shell.h"
 #include "base/strings/string_number_conversions.h"
 #include "grit/ash_resources.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/managed_display_info.h"
@@ skipping 53 matching lines @@
       [ui_scale](const scoped_refptr<display::ManagedDisplayMode>& mode) {
         return mode->ui_scale() == ui_scale;
       });
   if (iter == modes.end())
     return scoped_refptr<display::ManagedDisplayMode>();
   return *iter;
 }
 
 }  // namespace
 
+std::unique_ptr<MouseWarpController> CreateMouseWarpController(
+    DisplayManager* manager,
+    aura::Window* drag_source) {
+  if (manager->IsInUnifiedMode() && manager->num_connected_displays() >= 2)
+    return base::MakeUnique<UnifiedMouseWarpController>();
+  // Extra check for |num_connected_displays()| is for SystemDisplayApiTest
+  // that injects MockScreen.
+  if (manager->GetNumDisplays() < 2 || manager->num_connected_displays() < 2)
+    return base::MakeUnique<NullMouseWarpController>();
+  return base::MakeUnique<ExtendedMouseWarpController>(drag_source);
+}
+
 bool SetDisplayUIScale(int64_t id, float ui_scale) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   if (!display_manager->IsActiveDisplayId(id) ||
       !display::Display::IsInternalDisplayId(id)) {
     return false;
   }
   const display::ManagedDisplayInfo& info = display_manager->GetDisplayInfo(id);
 
   scoped_refptr<display::ManagedDisplayMode> mode =
       GetDisplayModeForUIScale(info, ui_scale);
@@ skipping 109 matching lines @@
   message_center::NotificationList::Notifications notifications =
       message_center::MessageCenter::Get()->GetVisibleNotifications();
   for (auto* const notification : notifications) {
     if (notification->id() == kDisplayErrorNotificationId)
       return notification->message();
   }
   return base::string16();
 }
 
 }  // namespace ash