Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(540)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: services/ui/ws/window_manager_client_unittest.cc

Issue 2764433003: mus-ws: Plumb FrameSinkId to Children (Closed)
Patch Set: Cleanup Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/ui/ws/test_utils.cc ('k') | services/ui/ws/window_tree.cc » ('j') | ui/aura/mus/window_tree_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/window_manager_client_unittest.cc
diff --git a/services/ui/ws/window_manager_client_unittest.cc b/services/ui/ws/window_manager_client_unittest.cc
index 02a59a7096c0b0adeb056c7eb4e7079a2043c313..9004a5f2f02348c1513f3cdbd77ad474ab87895b 100644
--- a/services/ui/ws/window_manager_client_unittest.cc
+++ b/services/ui/ws/window_manager_client_unittest.cc
@@ -714,7 +714,8 @@ TEST_F(WindowServerTest, EstablishConnectionViaFactory) {
aura::WindowTreeClient second_client(connector(), this, nullptr, nullptr,
nullptr, false);
second_client.ConnectViaWindowTreeFactory();
- aura::WindowTreeHostMus window_tree_host_in_second_client(&second_client);
+ aura::WindowTreeHostMus window_tree_host_in_second_client(
+ &second_client, cc::FrameSinkId(1, 1));
window_tree_host_in_second_client.InitHost();
window_tree_host_in_second_client.window()->Show();
ASSERT_TRUE(second_client.GetRoots().count(
@@ -743,7 +744,8 @@ TEST_F(WindowServerTest, OnWindowHierarchyChangedIncludesTransientParent) {
aura::WindowTreeClient second_client(connector(), this, nullptr, nullptr,
nullptr, false);
second_client.ConnectViaWindowTreeFactory();
- aura::WindowTreeHostMus window_tree_host_in_second_client(&second_client);
+ aura::WindowTreeHostMus window_tree_host_in_second_client(
+ &second_client, cc::FrameSinkId(1, 1));
window_tree_host_in_second_client.InitHost();
window_tree_host_in_second_client.window()->Show();
aura::Window* second_client_child = NewVisibleWindow(
« no previous file with comments | « services/ui/ws/test_utils.cc ('k') | services/ui/ws/window_tree.cc » ('j') | ui/aura/mus/window_tree_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698