Support creation of toplevel mus::Windows on separate displays

ash/mus/test/wm_test_base.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/test/wm_test_base.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/mus/bridge/wm_window_mus_test_api.h"
 #include "ash/mus/root_window_controller.h"
 #include "ash/mus/test/wm_test_helper.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window_tree_client.h"
-#include "ui/display/display.h"
 
 namespace ash {
 namespace mus {
 namespace {
 
 ui::mojom::WindowType MusWindowTypeFromWmWindowType(
     ui::wm::WindowType wm_window_type) {
   switch (wm_window_type) {
     case ui::wm::WINDOW_TYPE_UNKNOWN:
       break;
@@ skipping 88 matching lines @@
 
   ui::Window* window = test_helper_->GetRootsOrderedByDisplayId()[0]
                            ->window_manager()
                            ->NewTopLevelWindow(&properties);
   window->SetVisible(true);
   // Most tests expect a minimum size of 0x0.
   WmWindowMusTestApi(WmWindowMus::Get(window)).set_use_empty_minimum_size(true);
   return window;
 }
 
-ui::Window* WmTestBase::CreateFullscreenTestWindow() {
+ui::Window* WmTestBase::CreateFullscreenTestWindow(int64_t display_id) {
   std::map<std::string, std::vector<uint8_t>> properties;
   properties[ui::mojom::WindowManager::kShowState_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(
           static_cast<int32_t>(ui::mojom::ShowState::FULLSCREEN));
+
+  if (display_id > -1) {

[kylechar, 2016/11/23 14:14:20]

if (display_id != display::kInvalidDisplayId) { ... }

[thanhph, 2016/11/23 14:26:19]

Done.

+    properties[ui::mojom::WindowManager::kInitialDisplayId_Property] =
+        mojo::ConvertTo<std::vector<uint8_t>>(display_id);
+  }
+
   ui::Window* window = test_helper_->GetRootsOrderedByDisplayId()[0]
                            ->window_manager()
                            ->NewTopLevelWindow(&properties);
   window->SetVisible(true);
   return window;
 }
 
 ui::Window* WmTestBase::CreateChildTestWindow(ui::Window* parent,
                                               const gfx::Rect& bounds) {
   std::map<std::string, std::vector<uint8_t>> properties;
@@ skipping 16 matching lines @@
   test_helper_->Init();
 }
 
 void WmTestBase::TearDown() {
   teardown_called_ = true;
   test_helper_.reset();
 }
 
 }  // namespace mus
 }  // namespace ash