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];

[mfomitchev, 2016/11/18 17:36:24]

The current code doesn't seem to account for the possibility that this can
return nullptr. GetSecondaryDisplay()  never returns null. It might make sense
to design this method similarly?

[thanhph, 2016/11/18 19:15:44]

I get this idea from the function ui::Window*
WmTestBase::GetSecondaryRootWindow() (just right above), and somehow it returns
nullptr as well. I'm not sure why, we might just leave nullptr here as well.

+}
+
 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)));
@@ skipping 21 matching lines @@
   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);
   window->SetVisible(true);
   return window;
 }
 
+ui::Window* WmTestBase::CreateFullscreenTestWindow(RootWindowController* root) {

[mfomitchev, 2016/11/18 17:36:24]

Avoid duplicate code between this and the above method. E.g. call this from the
above method.

[thanhph, 2016/11/18 19:15:44]

I merged the codes in 2 functions. Thanks!

+  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));
+  properties[ui::mojom::WindowManager::kInitialDisplayId_Property] =
+      mojo::ConvertTo<std::vector<uint8_t>>(root->display().id());
+
+  // properties[ui::mojom::WindowManager::kInitialContainerId_Property] =

[mfomitchev, 2016/11/18 17:36:24]

remove

[thanhph, 2016/11/18 19:15:44]

Done.

+  // mojo::ConvertTo<std::vector<uint8_t>>(root->display().id());
+
+  ui::Window* window = root->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)));
   ui::Window* window = test_helper_->GetRootsOrderedByDisplayId()[0]
                            ->root()
                            ->window_tree()
                            ->NewWindow(&properties);
   window->SetBounds(bounds);
   window->SetVisible(true);
   parent->AddChild(window);
   return window;
 }
 
 void WmTestBase::SetUp() {
   setup_called_ = true;
   test_helper_.reset(new WmTestHelper);
   test_helper_->Init();
 }
 
 void WmTestBase::TearDown() {
   teardown_called_ = true;
   test_helper_.reset();
 }
 
 }  // namespace mus
 }  // namespace ash