Converts ash to use aura-mus

ui/views/mus/native_widget_mus.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.
 
 // This has to be before any other includes, else default is picked up.
 // See base/logging for details on this.
 #define NOTIMPLEMENTED_POLICY 5
 
 #include "ui/views/mus/native_widget_mus.h"
 
@@ skipping 48 matching lines @@
 #include "ui/views/window/custom_frame_view.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/cursor_manager.h"
 #include "ui/wm/core/default_screen_position_client.h"
 #include "ui/wm/core/focus_controller.h"
 #include "ui/wm/core/native_cursor_manager.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(ui::Window*);
 
+using PrimitiveType = aura::PropertyConverter::PrimitiveType;
 using ui::mojom::EventResult;
 
 namespace views {
 namespace {
 
 DEFINE_WINDOW_PROPERTY_KEY(ui::Window*, kMusWindow, nullptr);
 
 MUS_DEFINE_WINDOW_PROPERTY_KEY(NativeWidgetMus*, kNativeWidgetMusKey, nullptr);
 
 // This ensures that only the top-level aura Window can be activated.
@@ skipping 290 matching lines @@
   quit_closure.Run();
 }
 
 ui::mojom::ShowState GetShowState(const ui::Window* window) {
   if (!window ||
       !window->HasSharedProperty(
           ui::mojom::WindowManager::kShowState_Property)) {
     return ui::mojom::ShowState::DEFAULT;
   }
 
-  return static_cast<ui::mojom::ShowState>(window->GetSharedProperty<int32_t>(
-      ui::mojom::WindowManager::kShowState_Property));
+  return static_cast<ui::mojom::ShowState>(
+      window->GetSharedProperty<PrimitiveType>(
+          ui::mojom::WindowManager::kShowState_Property));
 }
 
 // Set the app or window icon property for the window.
 void SetIconProperty(ui::Window* window,
                      const char* const property,
                      const gfx::ImageSkia& icon) {
   // TODO(crbug.com/667566): Support additional scales or gfx::Image[Skia].
   SkBitmap bitmap = icon.GetRepresentation(1.f).sk_bitmap();
   if (!bitmap.isNull())
     window->SetSharedProperty<SkBitmap>(property, bitmap);
@@ skipping 268 matching lines @@
   if (!init_params.bounds.IsEmpty()) {
     (*properties)[ui::mojom::WindowManager::kUserSetBounds_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(init_params.bounds);
   }
   if (!init_params.name.empty()) {
     (*properties)[ui::mojom::WindowManager::kName_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(init_params.name);
   }
   (*properties)[ui::mojom::WindowManager::kAlwaysOnTop_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(
-          static_cast<aura::PropertyConverter::PrimitiveType>(
-              init_params.keep_on_top));
+          static_cast<PrimitiveType>(init_params.keep_on_top));
+
+  (*properties)[ui::mojom::WindowManager::kWindowType_Property] =
+      mojo::ConvertTo<std::vector<uint8_t>>(static_cast<PrimitiveType>(
+          mojo::ConvertTo<ui::mojom::WindowType>(init_params.type)));
 
   if (!Widget::RequiresNonClientView(init_params.type))
     return;
 
-  (*properties)[ui::mojom::WindowManager::kWindowType_Property] =
-      mojo::ConvertTo<std::vector<uint8_t>>(
-          static_cast<aura::PropertyConverter::PrimitiveType>(
-              mojo::ConvertTo<ui::mojom::WindowType>(init_params.type)));
-
   if (init_params.delegate) {
     if (properties->count(ui::mojom::WindowManager::kResizeBehavior_Property) ==
         0) {
       (*properties)[ui::mojom::WindowManager::kResizeBehavior_Property] =
-          mojo::ConvertTo<std::vector<uint8_t>>(
-              static_cast<aura::PropertyConverter::PrimitiveType>(
-                  init_params.delegate->GetResizeBehavior()));
+          mojo::ConvertTo<std::vector<uint8_t>>(static_cast<PrimitiveType>(
+              init_params.delegate->GetResizeBehavior()));
     }
 
     // TODO(crbug.com/667566): Support additional scales or gfx::Image[Skia].
     gfx::ImageSkia app_icon = init_params.delegate->GetWindowAppIcon();
     SkBitmap app_bitmap = app_icon.GetRepresentation(1.f).sk_bitmap();
     if (!app_bitmap.isNull()) {
       (*properties)[ui::mojom::WindowManager::kAppIcon_Property] =
           mojo::ConvertTo<std::vector<uint8_t>>(app_bitmap);
     }
     // TODO(crbug.com/667566): Support additional scales or gfx::Image[Skia].
@@ skipping 627 matching lines @@
   return true;
 }
 
 void NativeWidgetMus::OnSizeConstraintsChanged() {
   if (!window_ || is_parallel_widget_in_window_manager())
     return;
 
   int32_t behavior = ui::mojom::kResizeBehaviorNone;
   if (GetWidget()->widget_delegate())
     behavior = GetWidget()->widget_delegate()->GetResizeBehavior();
-  window_->SetSharedProperty<int32_t>(
+  window_->SetSharedProperty<PrimitiveType>(
       ui::mojom::WindowManager::kResizeBehavior_Property, behavior);
 }
 
 void NativeWidgetMus::RepostNativeEvent(gfx::NativeEvent native_event) {
   NOTIMPLEMENTED();
 }
 
 std::string NativeWidgetMus::GetName() const {
   return window_->GetName();
 }
@@ skipping 60 matching lines @@
   return native_widget_delegate_->HasHitTestMask();
 }
 
 void NativeWidgetMus::GetHitTestMask(gfx::Path* mask) const {
   native_widget_delegate_->GetHitTestMask(mask);
 }
 
 void NativeWidgetMus::SetShowState(ui::mojom::ShowState show_state) {
   if (!window_)
     return;
-  window_->SetSharedProperty<int32_t>(
+  window_->SetSharedProperty<PrimitiveType>(
       ui::mojom::WindowManager::kShowState_Property,
-      static_cast<int32_t>(show_state));
+      static_cast<PrimitiveType>(show_state));
 }
 
 void NativeWidgetMus::OnKeyEvent(ui::KeyEvent* event) {
   if (event->is_char()) {
     // If a ui::InputMethod object is attached to the root window, character
     // events are handled inside the object and are not passed to this function.
     // If such object is not attached, character events might be sent (e.g. on
     // Windows). In this case, we just skip these.
     return;
   }
@@ skipping 141 matching lines @@
 
   gfx::Path mask_path;
   native_widget_delegate_->GetHitTestMask(&mask_path);
   // TODO(jamescook): Use the full path for the mask.
   gfx::Rect mask_rect =
       gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds()));
   window_->SetHitTestMask(mask_rect);
 }
 
 }  // namespace views