Chromium Code Reviews| Index: ui/views/mus/window_manager_connection.cc |
| diff --git a/ui/views/mus/window_manager_connection.cc b/ui/views/mus/window_manager_connection.cc |
| index fbcae8276cb59391367275670366646b792d58ac..566c8bb33f8a2bf1d16bffca768c25e7c93a6c8e 100644 |
| --- a/ui/views/mus/window_manager_connection.cc |
| +++ b/ui/views/mus/window_manager_connection.cc |
| @@ -17,6 +17,7 @@ |
| #include "ui/gfx/geometry/rect.h" |
| #include "ui/views/mus/aura_init.h" |
| #include "ui/views/mus/native_widget_mus.h" |
| +#include "ui/views/mus/window_manager_client_area_insets.h" |
| namespace mojo { |
| @@ -57,6 +58,8 @@ struct TypeConverter<gfx::Display, mus::mojom::DisplayPtr> { |
| } // namespace mojo |
| +namespace views { |
| + |
| namespace { |
| using WindowManagerConnectionPtr = |
| @@ -68,18 +71,23 @@ base::LazyInstance<WindowManagerConnectionPtr>::Leaky lazy_tls_ptr = |
| std::vector<gfx::Display> GetDisplaysFromWindowManager( |
| mus::mojom::WindowManagerPtr* window_manager) { |
| + WindowManagerClientAreaInsets client_insets; |
| std::vector<gfx::Display> displays; |
| - (*window_manager)->GetDisplays( |
| - [&displays](mojo::Array<mus::mojom::DisplayPtr> mojom_displays) { |
| - displays = mojom_displays.To<std::vector<gfx::Display>>(); |
| + (*window_manager) |
| + ->GetConfig([&displays, |
| + &client_insets](mus::mojom::WindowManagerConfigPtr results) { |
| + displays = results->displays.To<std::vector<gfx::Display>>(); |
| + client_insets.normal_insets = |
| + results->normal_client_area_insets.To<gfx::Insets>(); |
| + client_insets.maximized_insets = |
| + results->maximized_client_area_insets.To<gfx::Insets>(); |
| }); |
| CHECK(window_manager->WaitForIncomingResponse()); |
| + NativeWidgetMus::SetWindowManagerClientAreaInsets(client_insets); |
|
Ben Goodger (Google)
2015/11/04 23:03:21
i'm a little concerned about this API in the futur
|
| return displays; |
| } |
| -} |
| - |
| -namespace views { |
| +} // namespace |
| // static |
| void WindowManagerConnection::Create( |