Fix moving the mouse between two displays after the secondary display becomes primary.

ash/display/window_tree_host_manager.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/display/window_tree_host_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <map>
 #include <utility>
@@ skipping 439 matching lines @@
   primary_display_id = new_primary_display.id();
   GetDisplayManager()->layout_store()->UpdatePrimaryDisplayId(
       display_manager->GetCurrentDisplayIdPair(), primary_display_id);
 
   UpdateWorkAreaOfDisplayNearestWindow(GetWindow(primary_host),
                                        old_primary_display.GetWorkAreaInsets());
   UpdateWorkAreaOfDisplayNearestWindow(GetWindow(non_primary_host),
                                        new_primary_display.GetWorkAreaInsets());
 
   // Update the dispay manager with new display info.
-  std::vector<DisplayInfo> display_info_list;
-  display_info_list.push_back(
-      display_manager->GetDisplayInfo(primary_display_id));
-  display_info_list.push_back(
-      display_manager->GetDisplayInfo(ScreenUtil::GetSecondaryDisplay().id()));
   GetDisplayManager()->set_force_bounds_changed(true);
-  GetDisplayManager()->UpdateDisplays(display_info_list);

[stevenjb, 2016/01/25 21:42:55]

Can we now rename DisplayManager::UpdateDisplays(vector) to
DisplayManager::UpdateDisplaysImpl(vector) so we don't have the unfortunate
situation where DisplayManager has two methods with the same name (we strongly
discourage that in Chrome)? This appears to have been the only place outside of
DisplayManager where the (vector) version is called.

[jdufault, 2016/01/25 22:48:46]

There are some tests that use the method. Given that, what do you think of
renaming UpdateDisplays(vector) to UpdateDisplaysTo(vector)?

+  GetDisplayManager()->UpdateDisplays();
   GetDisplayManager()->set_force_bounds_changed(false);
 }
 
 void WindowTreeHostManager::UpdateMouseLocationAfterDisplayChange() {
   // If the mouse is currently on a display in native location,
   // use the same native location. Otherwise find the display closest
   // to the current cursor location in screen coordinates.
 
   gfx::Point point_in_screen = Shell::GetScreen()->GetCursorScreenPoint();
   gfx::Point target_location_in_native;
@@ skipping 361 matching lines @@
   SetDisplayPropertiesOnHost(ash_host, display);
 
 #if defined(OS_CHROMEOS)
   if (switches::ConstrainPointerToRoot())
     ash_host->ConfineCursorToRootWindow();
 #endif
   return ash_host;
 }
 
 }  // namespace ash