Propagates window type properties during aura-mus window creation

ui/aura/mus/window_tree_client_unittest.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/aura/mus/window_tree_client.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/common/common_type_converters.h"
 #include "services/ui/public/cpp/property_type_converters.h"
+#include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/capture_client_observer.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/transient_window_client.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_mus.h"
 #include "ui/aura/mus/window_tree_client_delegate.h"
 #include "ui/aura/mus/window_tree_client_observer.h"
@@ skipping 116 matching lines @@
 // Verifies properties passed in OnWindowHierarchyChanged() make there way to
 // the new window.
 TEST_F(WindowTreeClientWmTest, OnWindowHierarchyChangedWithProperties) {
   RegisterTestProperties(GetPropertyConverter());
   window_tree()->AckAllChanges();
   const Id child_window_id = server_id(root_window()) + 11;
   ui::mojom::WindowDataPtr data = ui::mojom::WindowData::New();
   const uint8_t server_test_property1_value = 91;
   data->properties[kTestPropertyServerKey1] =
       ConvertToPropertyTransportValue(server_test_property1_value);
+  data->properties[ui::mojom::WindowManager::kWindowType_Property] =
+      mojo::ConvertTo<std::vector<uint8_t>>(
+          static_cast<int32_t>(ui::mojom::WindowType::BUBBLE));
   data->parent_id = server_id(root_window());
   data->window_id = child_window_id;
   data->bounds = gfx::Rect(1, 2, 3, 4);
   data->visible = false;
   std::vector<ui::mojom::WindowDataPtr> data_array(1);
   data_array[0] = std::move(data);
   ASSERT_TRUE(root_window()->children().empty());
   window_tree_client()->OnWindowHierarchyChanged(
       child_window_id, 0, server_id(root_window()), std::move(data_array));
   ASSERT_FALSE(window_tree()->has_change());
   ASSERT_EQ(1u, root_window()->children().size());
   Window* child = root_window()->children()[0];
   EXPECT_FALSE(child->TargetVisibility());
   EXPECT_EQ(server_test_property1_value, child->GetProperty(kTestPropertyKey1));
+  EXPECT_EQ(child->type(), ui::wm::WINDOW_TYPE_POPUP);
+  EXPECT_EQ(ui::mojom::WindowType::BUBBLE,
+            child->GetProperty(client::kWindowTypeKey));
 }
 
 // Verifies a move from the server doesn't attempt signal the server.
 TEST_F(WindowTreeClientWmTest, MoveFromServerDoesntAddAgain) {
   Window window1(nullptr);
   window1.Init(ui::LAYER_NOT_DRAWN);
   Window window2(nullptr);
   window2.Init(ui::LAYER_NOT_DRAWN);
   root_window()->AddChild(&window1);
   root_window()->AddChild(&window2);
@@ skipping 824 matching lines @@
   // Make |w1| the first child and ensure a REORDER was scheduled.
   root_window()->StackChildAtBottom(w1);
   EXPECT_EQ(w1, root_window()->children()[0]);
   EXPECT_EQ(w2, root_window()->children()[1]);
   EXPECT_EQ(w3, root_window()->children()[2]);
   EXPECT_TRUE(window_tree()->AckSingleChangeOfType(
       WindowTreeChangeType::REORDER, true));
   EXPECT_EQ(0u, window_tree()->number_of_changes());
 
   // Try stacking |w2| above |w3|. This should be disallowed as that would
-  // result in placing |w2| above its transient parent.
+  // result in placing |w2| above its transient child.
   root_window()->StackChildAbove(w2, w3);
   EXPECT_EQ(w1, root_window()->children()[0]);
   EXPECT_EQ(w2, root_window()->children()[1]);
   EXPECT_EQ(w3, root_window()->children()[2]);
   // NOTE: even though the order didn't change, internally the order was
   // changed and then changed back. That is the StackChildAbove() call really
   // succeeded, but then TransientWindowManager reordered the windows back to
   // a valid configuration. We expect only one REORDER here as the second
   // results from TransientWindowManager and we assume the server applied it as
   // well.
@@ skipping 329 matching lines @@
   window1.Init(ui::LAYER_NOT_DRAWN);
   Window* window2 = new Window(nullptr);
   window2->Init(ui::LAYER_NOT_DRAWN);
   window1.AddChild(window2);
   window_tree()->AckAllChanges();
   window_tree_client()->OnWindowDeleted(server_id(window2));
   EXPECT_FALSE(window_tree()->has_change());
 }
 
 }  // namespace aura