OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "services/ui/ws/window_tree.h" | 5 #include "services/ui/ws/window_tree.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 1089 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1100 window_data->parent_id = | 1100 window_data->parent_id = |
1101 parent ? ClientWindowIdForWindow(parent).id : ClientWindowId().id; | 1101 parent ? ClientWindowIdForWindow(parent).id : ClientWindowId().id; |
1102 window_data->window_id = | 1102 window_data->window_id = |
1103 window ? ClientWindowIdForWindow(window).id : ClientWindowId().id; | 1103 window ? ClientWindowIdForWindow(window).id : ClientWindowId().id; |
1104 window_data->transient_parent_id = | 1104 window_data->transient_parent_id = |
1105 transient_parent ? ClientWindowIdForWindow(transient_parent).id | 1105 transient_parent ? ClientWindowIdForWindow(transient_parent).id |
1106 : ClientWindowId().id; | 1106 : ClientWindowId().id; |
1107 window_data->bounds = window->bounds(); | 1107 window_data->bounds = window->bounds(); |
1108 window_data->properties = mojo::MapToUnorderedMap(window->properties()); | 1108 window_data->properties = mojo::MapToUnorderedMap(window->properties()); |
1109 window_data->visible = window->visible(); | 1109 window_data->visible = window->visible(); |
| 1110 window_data->local_surface_id = window->current_local_surface_id(); |
1110 return window_data; | 1111 return window_data; |
1111 } | 1112 } |
1112 | 1113 |
1113 void WindowTree::GetWindowTreeImpl( | 1114 void WindowTree::GetWindowTreeImpl( |
1114 const ServerWindow* window, | 1115 const ServerWindow* window, |
1115 std::vector<const ServerWindow*>* windows) const { | 1116 std::vector<const ServerWindow*>* windows) const { |
1116 DCHECK(window); | 1117 DCHECK(window); |
1117 | 1118 |
1118 if (!access_policy_->CanGetWindowTree(window)) | 1119 if (!access_policy_->CanGetWindowTree(window)) |
1119 return; | 1120 return; |
(...skipping 1159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2279 client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset, | 2280 client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset, |
2280 effect_bitmask, callback); | 2281 effect_bitmask, callback); |
2281 } | 2282 } |
2282 | 2283 |
2283 void WindowTree::PerformOnDragDropDone() { | 2284 void WindowTree::PerformOnDragDropDone() { |
2284 client()->OnDragDropDone(); | 2285 client()->OnDragDropDone(); |
2285 } | 2286 } |
2286 | 2287 |
2287 } // namespace ws | 2288 } // namespace ws |
2288 } // namespace ui | 2289 } // namespace ui |
OLD | NEW |