| Index: components/mus/ws/window_tree_impl.cc
|
| diff --git a/components/mus/ws/window_tree_impl.cc b/components/mus/ws/window_tree_impl.cc
|
| index e4eca337c2feff5eacf9e0b2862e20f8cb9c3d43..43f6e2580ae034789b3cf7560e47b8119cfae9e7 100644
|
| --- a/components/mus/ws/window_tree_impl.cc
|
| +++ b/components/mus/ws/window_tree_impl.cc
|
| @@ -182,15 +182,16 @@ void WindowTreeImpl::ProcessWindowBoundsChanged(const ServerWindow* window,
|
| Rect::From(new_bounds));
|
| }
|
|
|
| -void WindowTreeImpl::ProcessClientAreaChanged(const ServerWindow* window,
|
| - const gfx::Rect& old_client_area,
|
| - const gfx::Rect& new_client_area,
|
| - bool originated_change) {
|
| +void WindowTreeImpl::ProcessClientAreaChanged(
|
| + const ServerWindow* window,
|
| + const gfx::Insets& old_client_area,
|
| + const gfx::Insets& new_client_area,
|
| + bool originated_change) {
|
| if (originated_change || !IsWindowKnown(window))
|
| return;
|
| client()->OnClientAreaChanged(WindowIdToTransportId(window->id()),
|
| - Rect::From(old_client_area),
|
| - Rect::From(new_client_area));
|
| + mojo::Insets::From(old_client_area),
|
| + mojo::Insets::From(new_client_area));
|
| }
|
|
|
| void WindowTreeImpl::ProcessViewportMetricsChanged(
|
| @@ -669,16 +670,14 @@ void WindowTreeImpl::SetImeVisibility(Id transport_window_id,
|
| }
|
| }
|
|
|
| -void WindowTreeImpl::SetClientArea(Id transport_window_id, mojo::RectPtr rect) {
|
| +void WindowTreeImpl::SetClientArea(Id transport_window_id,
|
| + mojo::InsetsPtr insets) {
|
| ServerWindow* window =
|
| GetWindow(WindowIdFromTransportId(transport_window_id));
|
| if (!window || !access_policy_->CanSetClientArea(window))
|
| return;
|
|
|
| - if (rect.is_null())
|
| - window->SetClientArea(gfx::Rect(window->bounds().size()));
|
| - else
|
| - window->SetClientArea(rect.To<gfx::Rect>());
|
| + window->SetClientArea(insets.To<gfx::Insets>());
|
| }
|
|
|
| void WindowTreeImpl::Embed(Id transport_window_id,
|
| @@ -735,13 +734,6 @@ void WindowTreeImpl::SetShowState(uint32_t window_id,
|
| GetHost()->window_manager()->SetShowState(window_id, show_state, callback);
|
| }
|
|
|
| -void WindowTreeImpl::GetDisplays(const GetDisplaysCallback& callback) {
|
| - if (!GetHost() || !GetHost()->window_manager())
|
| - return;
|
| -
|
| - GetHost()->window_manager()->GetDisplays(callback);
|
| -}
|
| -
|
| bool WindowTreeImpl::IsRootForAccessPolicy(const WindowId& id) const {
|
| return IsRoot(id);
|
| }
|
|
|