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

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

Issue 2764433003: mus-ws: Plumb FrameSinkId to Children (Closed)
Patch Set: Addressed Antoine's comment 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/window_manager_client_unittest.cc ('k') | services/ui/ws/window_tree_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/window_tree.cc
diff --git a/services/ui/ws/window_tree.cc b/services/ui/ws/window_tree.cc
index 2e2f73bfdd471cbb3a3beebc78c98f00caf11dfb..3766990d2154e6a8214a5965dfeeab0666f92038 100644
--- a/services/ui/ws/window_tree.cc
+++ b/services/ui/ws/window_tree.cc
@@ -117,7 +117,8 @@ void WindowTree::Init(std::unique_ptr<WindowTreeBinding> binding,
const bool drawn = root->parent() && root->parent()->IsDrawn();
client()->OnEmbed(id_, WindowToWindowData(to_send.front()), std::move(tree),
- display_id, focused_window_id.id, drawn);
+ display_id, focused_window_id.id, drawn,
+ root->frame_sink_id());
}
void WindowTree::ConfigureWindowManager() {
@@ -200,9 +201,9 @@ void WindowTree::AddRootForWindowManager(const ServerWindow* root) {
Display* ws_display = GetDisplay(root);
DCHECK(ws_display);
- window_manager_internal_->WmNewDisplayAdded(ws_display->GetDisplay(),
- WindowToWindowData(root),
- root->parent()->IsDrawn());
+ window_manager_internal_->WmNewDisplayAdded(
+ ws_display->GetDisplay(), WindowToWindowData(root),
+ root->parent()->IsDrawn(), root->frame_sink_id());
}
void WindowTree::OnWindowDestroyingTreeImpl(WindowTree* tree) {
@@ -532,7 +533,7 @@ void WindowTree::OnWindowManagerCreatedTopLevelWindow(
int64_t display_id = display ? display->GetId() : display::kInvalidDisplayId;
const bool drawn = window->parent() && window->parent()->IsDrawn();
client()->OnTopLevelCreated(client_change_id, WindowToWindowData(window),
- display_id, drawn);
+ display_id, drawn, window->frame_sink_id());
}
void WindowTree::AddActivationParent(const ClientWindowId& window_id) {
« no previous file with comments | « services/ui/ws/window_manager_client_unittest.cc ('k') | services/ui/ws/window_tree_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698