Wires up WorkspaceLayoutManager in mash

mash/wm/non_client_frame_controller.cc

 // Copyright 2015 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 "mash/wm/non_client_frame_controller.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_manager_delegate.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
+#include "mash/wm/bridge/wm_window_mus.h"
 #include "mash/wm/frame/frame_border_hit_test_controller.h"
 #include "mash/wm/frame/move_event_handler.h"
 #include "mash/wm/frame/non_client_frame_view_mash.h"
 #include "mash/wm/property_util.h"
 #include "mash/wm/shadow.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/compositor/layer.h"
@@ skipping 150 matching lines @@
   NonClientFrameController* frame_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientViewMus);
 };
 
 }  // namespace
 
 // static
 void NonClientFrameController::Create(
     shell::Connector* connector,
+    mus::Window* parent,
     mus::Window* window,
     mus::WindowManagerClient* window_manager_client) {
-  new NonClientFrameController(connector, window, window_manager_client);
+  new NonClientFrameController(connector, parent, window,
+                               window_manager_client);
 }
 
 // static
 gfx::Insets NonClientFrameController::GetPreferredClientAreaInsets() {
   return NonClientFrameViewMash::GetPreferredClientAreaInsets();
 }
 
 // static
 int NonClientFrameController::GetMaxTitleBarButtonWidth() {
   return NonClientFrameViewMash::GetMaxTitleBarButtonWidth();
 }
 
 NonClientFrameController::NonClientFrameController(
     shell::Connector* connector,
+    mus::Window* parent,
     mus::Window* window,
     mus::WindowManagerClient* window_manager_client)
     : widget_(new views::Widget), window_(window) {
+  WmWindowMus::Get(window)->set_widget(widget_);
   window_->AddObserver(this);
 
   // To simplify things this code creates a Widget. While a Widget is created
   // we need to ensure we don't inadvertently change random properties of the
   // underlying mus::Window. For example, showing the Widget shouldn't change
   // the bounds of the mus::Window in anyway.
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   // We initiate focus at the mus level, not at the views level.
   params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
   params.delegate = this;
   params.native_widget =
       new WmNativeWidgetMus(widget_, connector, window, window_manager_client);
   widget_->Init(params);
+
+  parent->AddChild(window);
+
   widget_->ShowInactive();
 
   const int shadow_inset =
       Shadow::GetInteriorInsetForStyle(Shadow::STYLE_ACTIVE);
   window_manager_client->SetUnderlaySurfaceOffsetAndExtendedHitArea(
       window, gfx::Vector2d(shadow_inset, shadow_inset),
       FrameBorderHitTestController::GetResizeOutsideBoundsSize());
 }
 
 NonClientFrameController::~NonClientFrameController() {
@@ skipping 55 matching lines @@
     widget_->UpdateWindowTitle();
 }
 
 void NonClientFrameController::OnWindowDestroyed(mus::Window* window) {
   window_->RemoveObserver(this);
   window_ = nullptr;
 }
 
 }  // namespace wm
 }  // namespace mash