| Index: services/ui/ws/window_tree.h
|
| diff --git a/services/ui/ws/window_tree.h b/services/ui/ws/window_tree.h
|
| index cf0e37959de8cffeea7227aeeaa07e63ed99f075..42c4d527b80937a60eb2a2da9bd67799607cbca3 100644
|
| --- a/services/ui/ws/window_tree.h
|
| +++ b/services/ui/ws/window_tree.h
|
| @@ -167,7 +167,8 @@ class WindowTree : public mojom::WindowTree,
|
| bool SetCapture(const ClientWindowId& client_window_id);
|
| bool ReleaseCapture(const ClientWindowId& client_window_id);
|
| bool NewWindow(const ClientWindowId& client_window_id,
|
| - const std::map<std::string, std::vector<uint8_t>>& properties);
|
| + const std::map<std::string, std::vector<uint8_t>>& properties,
|
| + const cc::LocalFrameId& local_frame_id);
|
| bool AddWindow(const ClientWindowId& parent_id,
|
| const ClientWindowId& child_id);
|
| bool AddTransientWindow(const ClientWindowId& window_id,
|
| @@ -214,7 +215,8 @@ class WindowTree : public mojom::WindowTree,
|
| void ProcessWindowBoundsChanged(const ServerWindow* window,
|
| const gfx::Rect& old_bounds,
|
| const gfx::Rect& new_bounds,
|
| - bool originated_change);
|
| + bool originated_change,
|
| + const cc::LocalFrameId& local_frame_id);
|
| void ProcessClientAreaChanged(
|
| const ServerWindow* window,
|
| const gfx::Insets& new_client_area,
|
| @@ -374,7 +376,8 @@ class WindowTree : public mojom::WindowTree,
|
| Id transport_window_id,
|
| const base::Optional<
|
| std::unordered_map<std::string, std::vector<uint8_t>>>&
|
| - transport_properties) override;
|
| + transport_properties,
|
| + const cc::LocalFrameId& local_frame_id) override;
|
| void NewTopLevelWindow(
|
| uint32_t change_id,
|
| Id transport_window_id,
|
| @@ -403,7 +406,8 @@ class WindowTree : public mojom::WindowTree,
|
| void StopPointerWatcher() override;
|
| void SetWindowBounds(uint32_t change_id,
|
| Id window_id,
|
| - const gfx::Rect& bounds) override;
|
| + const gfx::Rect& bounds,
|
| + const cc::LocalFrameId& local_frame_id) override;
|
| void SetWindowVisibility(uint32_t change_id,
|
| Id window_id,
|
| bool visible) override;
|
|
|