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

Unified Diff: ui/views/mus/window_manager_connection.cc

Issue 1419793006: Makes windowmanager draw non-client area (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add include Created 5 years, 1 month 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 | « ui/views/mus/window_manager_client_area_insets.h ('k') | ui/views/window/non_client_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b46ac10dffd114ed7d0089a617141618a9b42249..006a8b366c1fbf8f5c5f228ee2fd709663efa168 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/mojo/init/ui_init.h"
#include "ui/views/mus/native_widget_mus.h"
+#include "ui/views/mus/window_manager_client_area_insets.h"
#include "ui/views/views_delegate.h"
namespace mojo {
@@ -58,6 +59,8 @@ struct TypeConverter<gfx::Display, mus::mojom::DisplayPtr> {
} // namespace mojo
+namespace views {
+
namespace {
using WindowManagerConnectionPtr =
@@ -69,18 +72,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);
return displays;
}
-}
-
-namespace views {
+} // namespace
// static
void WindowManagerConnection::Create(
« no previous file with comments | « ui/views/mus/window_manager_client_area_insets.h ('k') | ui/views/window/non_client_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698