Initial cut of ash/wm/common classes for mus

mash/wm/property_util.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/property_util.h"
 
 #include <stdint.h>
 
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window_property.h"
@@ skipping 15 matching lines @@
       static_cast<uint32_t>(show_state));
 }
 
 mus::mojom::ShowState GetWindowShowState(const mus::Window* window) {
   if (window->HasSharedProperty(
           mus::mojom::WindowManager::kShowState_Property)) {
     return static_cast<mus::mojom::ShowState>(
         window->GetSharedProperty<int32_t>(
             mus::mojom::WindowManager::kShowState_Property));
   }
-  return mus::mojom::ShowState::RESTORED;
+  return mus::mojom::ShowState::DEFAULT;
 }
 
 void SetWindowUserSetBounds(mus::Window* window, const gfx::Rect& bounds) {
   if (bounds.IsEmpty()) {
     window->ClearSharedProperty(
         mus::mojom::WindowManager::kUserSetBounds_Property);
   } else {
     window->SetSharedProperty<gfx::Rect>(
         mus::mojom::WindowManager::kUserSetBounds_Property, bounds);
   }
@@ skipping 75 matching lines @@
     const mus::Window::SharedProperties& properties) {
   const auto iter =
       properties.find(mus::mojom::WindowManager::kWindowType_Property);
   if (iter != properties.end()) {
     return static_cast<mus::mojom::WindowType>(
         mojo::ConvertTo<int32_t>(iter->second));
   }
   return mus::mojom::WindowType::POPUP;
 }
 
+ui::wm::WindowType GetWmWindowType(const mus::Window* window) {
+  switch (GetWindowType(window)) {
+    case mus::mojom::WindowType::WINDOW:
+      return ui::wm::WINDOW_TYPE_NORMAL;
+
+    case mus::mojom::WindowType::PANEL:
+      return ui::wm::WINDOW_TYPE_PANEL;
+
+    case mus::mojom::WindowType::CONTROL:
+      return ui::wm::WINDOW_TYPE_CONTROL;
+
+    case mus::mojom::WindowType::WINDOW_FRAMELESS:
+    case mus::mojom::WindowType::POPUP:
+    case mus::mojom::WindowType::BUBBLE:
+    case mus::mojom::WindowType::DRAG:
+      return ui::wm::WINDOW_TYPE_POPUP;
+
+    case mus::mojom::WindowType::MENU:
+      return ui::wm::WINDOW_TYPE_MENU;
+
+    case mus::mojom::WindowType::TOOLTIP:
+      return ui::wm::WINDOW_TYPE_TOOLTIP;
+  }
+
+  return ui::wm::WINDOW_TYPE_UNKNOWN;
+}
+
 mojom::AshWindowType GetAshWindowType(const mus::Window* window) {
   if (!window->HasSharedProperty(mojom::kAshWindowType_Property))
     return mojom::AshWindowType::COUNT;
 
   return static_cast<mojom::AshWindowType>(
       window->GetSharedProperty<int32_t>(mojom::kAshWindowType_Property));
 }
 
 base::string16 GetWindowTitle(const mus::Window* window) {
   if (!window->HasSharedProperty(
@@ skipping 30 matching lines @@
 
 bool GetWindowIgnoredByShelf(mus::Window* window) {
   return window->HasSharedProperty(
              mus::mojom::WindowManager::kWindowIgnoredByShelf_Property) &&
          window->GetSharedProperty<bool>(
              mus::mojom::WindowManager::kWindowIgnoredByShelf_Property);
 }
 
 }  // namespace wm
 }  // namespace mash