Moves FrameDecorations from Display to WindowManagerState

components/mus/ws/window_tree.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/mus/ws/window_tree.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 555 matching lines @@
 
 DisplayManager* WindowTree::display_manager() {
   return connection_manager_->display_manager();
 }
 
 const DisplayManager* WindowTree::display_manager() const {
   return connection_manager_->display_manager();
 }
 
 Display* WindowTree::GetDisplayForWindowManager() {
+  return GetWindowManagerStateForWindowManager()->display();
+}
+
+WindowManagerState* WindowTree::GetWindowManagerStateForWindowManager() {
   // The WindowTree for the wm has one and only one root.
   CHECK_EQ(1u, roots_.size());
 
   // Indicates this connection is for the wm.
   DCHECK(window_manager_internal_);
 
-  Display* display = GetDisplay(*roots_.begin());
-  WindowManagerAndDisplay wm_and_display =
-      display_manager()->GetWindowManagerAndDisplay(*roots_.begin());
-  CHECK(wm_and_display.display);
-  CHECK(wm_and_display.window_manager_state);
-  DCHECK_EQ(this, wm_and_display.window_manager_state->tree());
-  return display;
+  WindowManagerState* wms = display_manager()
+                                ->GetWindowManagerAndDisplay(*roots_.begin())
+                                .window_manager_state;
+  CHECK(wms);
+  DCHECK_EQ(this, wms->tree());
+  return wms;
 }
 
 bool WindowTree::ShouldRouteToWindowManager(const ServerWindow* window) const {
   // If the client created this window, then do not route it through the WM.
   if (window->id().connection_id == id_)
     return false;
 
   // If the client did not create the window, then it must be the root of the
   // client. If not, that means the client should not know about this window,
   // and so do not route the request to the WM.
@@ skipping 721 matching lines @@
       GetWindowByClientId(ClientWindowId(transport_window_id));
   WindowTree* tree = connection_manager_->GetTreeWithRoot(window);
   if (tree && tree != this) {
     tree->client()->RequestClose(tree->ClientWindowIdForWindow(window).id);
   }
   // TODO(sky): think about what else case means.
 }
 
 void WindowTree::WmSetFrameDecorationValues(
     mojom::FrameDecorationValuesPtr values) {
-  if (GetDisplayForWindowManager())
-    GetDisplayForWindowManager()->SetFrameDecorationValues(std::move(values));
+  WindowManagerState* wm_state = GetWindowManagerStateForWindowManager();
+  if (wm_state)
+    wm_state->SetFrameDecorationValues(std::move(values));
 }
 
 void WindowTree::OnWmCreatedTopLevelWindow(uint32_t change_id,
                                            Id transport_window_id) {
   if (GetDisplayForWindowManager()) {
     ServerWindow* window =
         GetWindowByClientId(ClientWindowId(transport_window_id));
     if (window && window->id().connection_id != id_) {
       connection_manager_->WindowManagerSentBogusMessage();
       window = nullptr;
@@ skipping 25 matching lines @@
 
   for (const auto* root : roots_) {
     if (root->Contains(window))
       return true;
   }
   return false;
 }
 
 }  // namespace ws
 }  // namespace mus