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"
@@ skipping 76 matching lines @@
   DCHECK(!roots.empty());
   return roots[0]->display();
 }
 
 display::Display WmTestBase::GetSecondaryDisplay() {
   std::vector<RootWindowController*> roots =
       test_helper_->GetRootsOrderedByDisplayId();
   return roots.size() < 2 ? display::Display() : roots[1]->display();
 }
 
+RootWindowController* WmTestBase::GetPrimaryRootWindowController() {
+  std::vector<RootWindowController*> roots =
+      test_helper_->GetRootsOrderedByDisplayId();
+  DCHECK(!roots.empty());
+  return roots[0];
+}
+
+RootWindowController* WmTestBase::GetSecondaryRootWindowController() {
+  std::vector<RootWindowController*> roots =
+      test_helper_->GetRootsOrderedByDisplayId();
+  return roots.size() < 2 ? nullptr : roots[1];
+}
+
 ui::Window* WmTestBase::CreateTestWindow(const gfx::Rect& bounds) {
   return CreateTestWindow(bounds, ui::wm::WINDOW_TYPE_NORMAL);
 }
 
 ui::Window* WmTestBase::CreateTestWindow(const gfx::Rect& bounds,
                                          ui::wm::WindowType window_type) {
   std::map<std::string, std::vector<uint8_t>> properties;
   properties[ui::mojom::WindowManager::kWindowType_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(
           static_cast<int32_t>(MusWindowTypeFromWmWindowType(window_type)));
   if (!bounds.IsEmpty()) {
     properties[ui::mojom::WindowManager::kInitialBounds_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(bounds);
   }
   properties[ui::mojom::WindowManager::kResizeBehavior_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(
           ui::mojom::kResizeBehaviorCanResize |
           ui::mojom::kResizeBehaviorCanMaximize |
           ui::mojom::kResizeBehaviorCanMinimize);
 
   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(
+    RootWindowController* root = nullptr) {
   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));
-  ui::Window* window = test_helper_->GetRootsOrderedByDisplayId()[0]
-                           ->window_manager()
-                           ->NewTopLevelWindow(&properties);
+
+  ui::Window* window = nullptr;
+  if (root) {
+    properties[ui::mojom::WindowManager::kInitialDisplayId_Property] =
+        mojo::ConvertTo<std::vector<uint8_t>>(root->display().id());
+    window = root->window_manager()->NewTopLevelWindow(&properties);

[mfomitchev, 2016/11/18 20:35:58]

I think window manager is the same for all root windows? If so we don't actually
need RootWindowController here as an arg to this function. What we need is the
display id. So maybe this function could take display id (or at least Display)
instead of RWC pointer. And then we can also get rid of the new
GetPrimary/SecondaryRootWindowController methods.

(You could still keep CreateFullscreenTestWindow() with no args if you wish, it
should just call CreateFullscreenTestWindow(<id of the first display>) so that
there's no code duplication.

[thanhph, 2016/11/18 20:53:08]

Great stuff here Mikhail, thanks! The WM is the same for all root windows. I
have refactored/reduce the code to your suggestion. Thanks! 

+  } else
+    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;
   properties[ui::mojom::WindowManager::kWindowType_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(static_cast<int32_t>(
           MusWindowTypeFromWmWindowType(ui::wm::WINDOW_TYPE_NORMAL)));
@@ skipping 13 matching lines @@
   test_helper_->Init();
 }
 
 void WmTestBase::TearDown() {
   teardown_called_ = true;
   test_helper_.reset();
 }
 
 }  // namespace mus
 }  // namespace ash