Support creation of toplevel mus::Windows on separate displays

ash/mus/root_window_controller.cc

 // Copyright 2016 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/mus/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 84 matching lines @@
 
   // TODO(sky): constrain and validate properties before passing to server.
   ui::Window* window = root_->window_tree()->NewWindow(properties);
   window->SetBounds(CalculateDefaultBounds(window));
 
   ui::Window* container_window = nullptr;
   int container_id = kShellWindowId_Invalid;
   if (GetRequestedContainer(window, &container_id)) {
     container_window = GetWindowByShellWindowId(container_id)->mus_window();
   } else {
-    // TODO(sky): window->bounds() isn't quite right.
+    const gfx::Point top_right_in_screen =
+        wm_root_window_controller_->ConvertPointToScreen(
+            WmWindowMus::Get(window), window->bounds().top_right());
+
+    const gfx::Point bottom_left_in_screen =
+        wm_root_window_controller_->ConvertPointToScreen(
+            WmWindowMus::Get(window), window->bounds().bottom_left());
+
+    const gfx::Rect bounds_in_screen =
+        gfx::Rect(bottom_left_in_screen.x(), top_right_in_screen.y(),
+                  top_right_in_screen.x() - bottom_left_in_screen.x(),
+                  bottom_left_in_screen.y() - top_right_in_screen.y());
+
     container_window = WmWindowMus::GetMusWindow(wm::GetDefaultParent(
-        WmWindowMus::Get(root_), WmWindowMus::Get(window), window->bounds()));
+        WmWindowMus::Get(root_), WmWindowMus::Get(window), bounds_in_screen));
   }
   DCHECK(WmWindowMus::Get(container_window)->IsContainer());
 
   if (provide_non_client_frame) {
     NonClientFrameController::Create(container_window, window,
                                      window_manager_->window_manager_client());
   } else {
     container_window->AddChild(window);
   }
 
@@ skipping 59 matching lines @@
 void RootWindowController::CreateLayoutManagers() {
   // Override the default layout managers for certain containers.
   WmWindowMus* lock_screen_container =
       GetWindowByShellWindowId(kShellWindowId_LockScreenContainer);
   layout_managers_[lock_screen_container->mus_window()].reset(
       new ScreenlockLayout(lock_screen_container->mus_window()));
 }
 
 }  // namespace mus
 }  // namespace ash