Removes/promotes functions from WmWindowMus to WmWindowAura

ash/mus/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 "ash/mus/non_client_frame_controller.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_layout_constants.h"
 #include "ash/common/frame/custom_frame_view_ash.h"
 #include "ash/common/wm/panels/panel_frame_view.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/frame/custom_frame_view_mus.h"
 #include "ash/mus/frame/detached_title_area_renderer.h"
 #include "ash/mus/move_event_handler.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/shadow.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_properties.h"
 #include "ash/shared/immersive_fullscreen_controller_delegate.h"
+#include "ash/wm/window_properties.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/property_utils.h"
 #include "ui/aura/mus/window_manager_delegate.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/window.h"
@@ skipping 264 matching lines @@
   params.parent = parent;
   params.context = context;
   // TODO: properly set |params.activatable|. Should key off whether underlying
   // (mus) window can have focus.
   params.delegate = this;
   params.bounds = bounds;
   WmNativeWidgetAura* native_widget = new WmNativeWidgetAura(
       widget_, window_manager_client_, ShouldRemoveStandardFrame(*properties),
       ShouldEnableImmersive(*properties));
   window_ = native_widget->GetNativeView();
-  WmWindowMus* wm_window = WmWindowMus::Get(window_);
-  wm_window->set_widget(widget_, WmWindowMus::WidgetCreationType::FOR_CLIENT);
+  window_->SetProperty(kWidgetCreationTypeKey, WidgetCreationType::FOR_CLIENT);
   window_->AddObserver(this);
   params.native_widget = native_widget;
   aura::SetWindowType(window_, window_type);
   aura::PropertyConverter* property_converter =
       window_manager->property_converter();
   for (auto& property_pair : *properties) {
     property_converter->SetPropertyFromTransportValue(
         window_, property_pair.first, &property_pair.second);
   }
   // Applying properties will have set the show state if specified.
   // NativeWidgetAura resets the show state from |params|, so we need to update
   // |params|.
   params.show_state = window_->GetProperty(aura::client::kShowStateKey);
   widget_->Init(params);
   did_init_native_widget_ = true;
 
   widget_->ShowInactive();
 
   const int shadow_inset =
       Shadow::GetInteriorInsetForStyle(Shadow::STYLE_ACTIVE);
+  WmWindowMus* wm_window = WmWindowMus::Get(window_);
   const gfx::Insets extended_hit_region =
       wm_window->ShouldUseExtendedHitRegion() ? GetExtendedHitRegion()
                                               : gfx::Insets();
   window_manager_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea(
       window_, gfx::Vector2d(shadow_inset, shadow_inset), extended_hit_region);
 }
 
 // static
 NonClientFrameController* NonClientFrameController::Get(aura::Window* window) {
   return window->GetProperty(kNonClientFrameControllerKey);
@@ skipping 106 matching lines @@
   }
 }
 
 void NonClientFrameController::OnWindowDestroyed(aura::Window* window) {
   window_->RemoveObserver(this);
   window_ = nullptr;
 }
 
 }  // namespace mus
 }  // namespace ash