Set window bounds once when moving display.

This change avoids set window bounds twice.

BUG=chromium:843001
TEST=Manual test on an eve device.

Change-Id: If08f8e4fd7b8e91db43f265fa8fdc46c3da6eb86
Reviewed-on: https://chromium-review.googlesource.com/1087844Reviewed-by: Stefan Kuhne <skuhne@chromium.org>
Commit-Queue: Tim Zheng <timzheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#564749}

chrome/browser/ui/ash/launcher/crostini_app_window_shelf_controller.cc

@@ -142,15 +142,15 @@ void CrostiniAppWindowShelfController::OnWindowPropertyChanged(
       crostini_app_display_.GetDisplayIdForStartupId(*startup_id);
   if (display_id == display::kInvalidDisplayId)
     return;
-  gfx::Rect bounds = window->bounds();
   display::Display display;
   if (!display::Screen::GetScreen()->GetDisplayWithDisplayId(display_id,
                                                              &display))
     return;
-  window->SetBoundsInScreen(window->GetBoundsInScreen(), display);
-  // The origin of the window is off after the above statement and needs to be
-  // reset. http://crbug.com/848970.
-  window->SetBounds(bounds);
+  gfx::Rect bounds = window->bounds();
+  gfx::Point origin = display.bounds().origin();
+  origin.Offset(bounds.x(), bounds.y());
+  bounds.set_origin(origin);
+  window->SetBoundsInScreen(bounds, display);
 }
 
 void CrostiniAppWindowShelfController::OnWindowVisibilityChanged(