Moves mash/wm/public -> ash/public

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 52 matching lines @@
 
 gfx::Size GetWindowPreferredSize(const mus::Window* window) {
   if (window->HasSharedProperty(
           mus::mojom::WindowManager::kPreferredSize_Property)) {
     return window->GetSharedProperty<gfx::Size>(
         mus::mojom::WindowManager::kPreferredSize_Property);
   }
   return gfx::Size();
 }
 
-mojom::Container GetRequestedContainer(const mus::Window* window) {
-  if (window->HasSharedProperty(mojom::kWindowContainer_Property)) {
-    return static_cast<mojom::Container>(
-        window->GetSharedProperty<int32_t>(mojom::kWindowContainer_Property));
+ash::mojom::Container GetRequestedContainer(const mus::Window* window) {
+  if (window->HasSharedProperty(ash::mojom::kWindowContainer_Property)) {
+    return static_cast<ash::mojom::Container>(
+        window->GetSharedProperty<int32_t>(
+            ash::mojom::kWindowContainer_Property));
   }
-  return mojom::Container::USER_PRIVATE_WINDOWS;
+  return ash::mojom::Container::USER_PRIVATE_WINDOWS;
 }
 
 int32_t GetResizeBehavior(const mus::Window* window) {
   if (window->HasSharedProperty(
           mus::mojom::WindowManager::kResizeBehavior_Property)) {
     return window->GetSharedProperty<int32_t>(
         mus::mojom::WindowManager::kResizeBehavior_Property);
   }
   return mus::mojom::kResizeBehaviorNone;
 }
@@ skipping 61 matching lines @@
     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;
+ash::mojom::AshWindowType GetAshWindowType(const mus::Window* window) {
+  if (!window->HasSharedProperty(ash::mojom::kAshWindowType_Property))
+    return ash::mojom::AshWindowType::COUNT;
 
-  return static_cast<mojom::AshWindowType>(
-      window->GetSharedProperty<int32_t>(mojom::kAshWindowType_Property));
+  return static_cast<ash::mojom::AshWindowType>(
+      window->GetSharedProperty<int32_t>(ash::mojom::kAshWindowType_Property));
 }
 
 base::string16 GetWindowTitle(const mus::Window* window) {
   if (!window->HasSharedProperty(
           mus::mojom::WindowManager::kWindowTitle_Property)) {
     return base::string16();
   }
 
   return window->GetSharedProperty<base::string16>(
       mus::mojom::WindowManager::kWindowTitle_Property);
@@ skipping 48 matching lines @@
 
 bool IsAlwaysOnTop(mus::Window* window) {
   return window->HasSharedProperty(
              mus::mojom::WindowManager::kAlwaysOnTop_Property) &&
          window->GetSharedProperty<bool>(
              mus::mojom::WindowManager::kAlwaysOnTop_Property);
 }
 
 }  // namespace wm
 }  // namespace mash