mash: Fix shelf on second display appearing in wrong position

ui/views/mus/native_widget_mus.cc

 // Copyright 2015 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 "ui/views/mus/native_widget_mus.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 889 matching lines @@
     window_->ClearSharedProperty(kWindowAppIcon_Property);
   }
 }
 
 void NativeWidgetMus::InitModalType(ui::ModalType modal_type) {
   if (modal_type != ui::MODAL_TYPE_NONE)
     window_->SetModal();
 }
 
 gfx::Rect NativeWidgetMus::GetWindowBoundsInScreen() const {
-  return window_ ? window_->GetBoundsInRoot() : gfx::Rect();
+  if (!window_)
+    return gfx::Rect();
+
+  // Correct for the origin of the display.
+  const int64_t window_display_id = window_->GetRoot()->display_id();
+  for (display::Display display :
+       display::Screen::GetScreen()->GetAllDisplays()) {
+    if (display.id() == window_display_id) {
+      gfx::Point display_origin = display.bounds().origin();
+      gfx::Rect bounds_in_screen = window_->GetBoundsInRoot();
+      bounds_in_screen.Offset(display_origin.x(), display_origin.y());
+      return bounds_in_screen;
+    }
+  }
+  // Unknown display, assume primary display at 0,0.
+  return window_->GetBoundsInRoot();
 }
 
 gfx::Rect NativeWidgetMus::GetClientAreaBoundsInScreen() const {
   // View-to-screen coordinate system transformations depend on this returning
   // the full window bounds, for example View::ConvertPointToScreen().
   return GetWindowBoundsInScreen();
 }
 
 gfx::Rect NativeWidgetMus::GetRestoredBounds() const {
   // Restored bounds should only be relevant if the window is minimized,
   // maximized, fullscreen or docked. However, in some places the code expects
   // GetRestoredBounds() to return the current window bounds if the window is
   // not in either state.
   if (IsMinimized() || IsMaximized() || IsFullscreen()) {
     const char* kRestoreBounds_Property =
         ui::mojom::WindowManager::kRestoreBounds_Property;
     if (window_->HasSharedProperty(kRestoreBounds_Property))
       return window_->GetSharedProperty<gfx::Rect>(kRestoreBounds_Property);
   }
   return GetWindowBoundsInScreen();
 }
 
 std::string NativeWidgetMus::GetWorkspace() const {
   return std::string();
 }
 
-void NativeWidgetMus::SetBounds(const gfx::Rect& bounds) {
+void NativeWidgetMus::SetBounds(const gfx::Rect& bounds_in_screen) {

[sky, 2016/09/08 23:52:56]

Rename arg in header to match.

[James Cook, 2016/09/09 03:55:36]

Done.

   if (!(window_ && window_tree_host_))
     return;
 
-  gfx::Size size(bounds.size());
+  // TODO(jamescook): Needs something like aura::ScreenPositionClient so higher
+  // level code can move windows between displays. crbug.com/645291
+  gfx::Point origin(bounds_in_screen.origin());
+  const gfx::Point display_origin = display::Screen::GetScreen()
+                                        ->GetDisplayMatching(bounds_in_screen)
+                                        .bounds()
+                                        .origin();
+  origin.Offset(-display_origin.x(), -display_origin.y());
+
+  gfx::Size size(bounds_in_screen.size());
   const gfx::Size min_size = GetMinimumSize();
   const gfx::Size max_size = GetMaximumSize();
   if (!max_size.IsEmpty())
     size.SetToMin(max_size);
   size.SetToMax(min_size);
-  window_->SetBounds(gfx::Rect(bounds.origin(), size));
+  window_->SetBounds(gfx::Rect(origin, size));
   // Observer on |window_tree_host_| expected to synchronously update bounds.
   DCHECK(window_->bounds() == window_tree_host_->GetBounds());
 }
 
 void NativeWidgetMus::SetSize(const gfx::Size& size) {
   if (!window_tree_host_)
     return;
 
   gfx::Rect bounds = window_tree_host_->GetBounds();
   SetBounds(gfx::Rect(bounds.origin(), size));
@@ skipping 479 matching lines @@
 
   gfx::Path mask_path;
   native_widget_delegate_->GetHitTestMask(&mask_path);
   // TODO(jamescook): Use the full path for the mask.
   gfx::Rect mask_rect =
       gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds()));
   window_->SetHitTestMask(mask_rect);
 }
 
 }  // namespace views