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

Unified Diff: components/mus/ws/window_manager_state.cc

Issue 1775583002: Moves FrameDecorations from Display to WindowManagerState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: override Created 4 years, 9 months 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 | « components/mus/ws/window_manager_state.h ('k') | components/mus/ws/window_tree.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/window_manager_state.cc
diff --git a/components/mus/ws/window_manager_state.cc b/components/mus/ws/window_manager_state.cc
index 53879eca59e3089e6e29f2cbdf581fd19bd3cdb6..f7ccc63d2d3aca7686b16a2717a41c54373f6639 100644
--- a/components/mus/ws/window_manager_state.cc
+++ b/components/mus/ws/window_manager_state.cc
@@ -7,6 +7,7 @@
#include "components/mus/ws/connection_manager.h"
#include "components/mus/ws/display_manager.h"
#include "components/mus/ws/server_window.h"
+#include "components/mus/ws/user_display_manager.h"
#include "mojo/shell/public/interfaces/connector.mojom.h"
namespace mus {
@@ -26,6 +27,11 @@ WindowManagerState::WindowManagerState(Display* display,
: display_(display),
is_user_id_valid_(is_user_id_valid),
user_id_(user_id) {
+ frame_decoration_values_ = mojom::FrameDecorationValues::New();
+ frame_decoration_values_->normal_client_area_insets = mojo::Insets::New();
+ frame_decoration_values_->maximized_client_area_insets = mojo::Insets::New();
+ frame_decoration_values_->max_title_bar_button_width = 0u;
+
ConnectionManager* connection_manager = display_->connection_manager();
root_.reset(connection_manager->CreateServerWindow(
connection_manager->display_manager()->GetAndAdvanceNextRootId(),
@@ -38,5 +44,22 @@ WindowManagerState::WindowManagerState(Display* display,
display->root_window()->Add(root_.get());
}
+void WindowManagerState::SetFrameDecorationValues(
+ mojom::FrameDecorationValuesPtr values) {
+ got_frame_decoration_values_ = true;
+ frame_decoration_values_ = values.Clone();
+ display_->display_manager()
+ ->GetUserDisplayManager(user_id_)
+ ->OnFrameDecorationValuesChanged(this);
+}
+
+mojom::DisplayPtr WindowManagerState::ToMojomDisplay() const {
+ mojom::DisplayPtr display_ptr = display_->ToMojomDisplay();
+ // TODO(sky): set work area.
+ display_ptr->work_area = display_ptr->bounds.Clone();
+ display_ptr->frame_decoration_values = frame_decoration_values_.Clone();
+ return display_ptr;
+}
+
} // namespace ws
} // namespace mus
« no previous file with comments | « components/mus/ws/window_manager_state.h ('k') | components/mus/ws/window_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698