Moves mash/wm/public -> ash/public

mash/wm/user_window_controller_impl.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/user_window_controller_impl.h"
 
+#include "ash/public/interfaces/container.mojom.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/mus/public/cpp/window_tree_client.h"
 #include "mash/wm/property_util.h"
-#include "mash/wm/public/interfaces/container.mojom.h"
 #include "mash/wm/root_window_controller.h"
 #include "mojo/common/common_type_converters.h"
 #include "ui/resources/grit/ui_resources.h"
 
 MUS_DECLARE_WINDOW_PROPERTY_TYPE(uint32_t);
 
 namespace mash {
 namespace wm {
 
 // Key used for storing identifier sent to clients for windows.
 MUS_DEFINE_LOCAL_WINDOW_PROPERTY_KEY(uint32_t, kUserWindowIdKey, 0u);
 
 namespace {
 
 // Returns |window|, or an ancestor thereof, parented to |container|, or null.
 mus::Window* GetTopLevelWindow(mus::Window* window, mus::Window* container) {
   while (window && window->parent() != container)
     window = window->parent();
   return window;
 }
 
 // Get a UserWindow struct from a mus::Window.
-mojom::UserWindowPtr GetUserWindow(mus::Window* window) {
-  mojom::UserWindowPtr user_window(mojom::UserWindow::New());
+ash::mojom::UserWindowPtr GetUserWindow(mus::Window* window) {
+  ash::mojom::UserWindowPtr user_window(ash::mojom::UserWindow::New());
   DCHECK_NE(0u, window->GetLocalProperty(kUserWindowIdKey));
   user_window->window_id = window->GetLocalProperty(kUserWindowIdKey);
   user_window->window_title = mojo::String::From(GetWindowTitle(window));
   user_window->window_app_icon = GetWindowAppIcon(window);
   user_window->window_app_id = mojo::String::From(GetAppID(window));
   user_window->ignored_by_shelf = GetWindowIgnoredByShelf(window);
   mus::Window* focused = window->window_tree()->GetFocusedWindow();
   focused = GetTopLevelWindow(focused, window->parent());
   user_window->window_has_focus = focused == window;
   return user_window;
@@ skipping 78 matching lines @@
 mus::Window* UserWindowControllerImpl::GetUserWindowById(uint32_t id) {
   for (mus::Window* window : GetUserWindowContainer()->children()) {
     if (window->GetLocalProperty(kUserWindowIdKey) == id)
       return window;
   }
   return nullptr;
 }
 
 mus::Window* UserWindowControllerImpl::GetUserWindowContainer() const {
   return root_controller_->GetWindowForContainer(
-      mojom::Container::USER_PRIVATE_WINDOWS);
+      ash::mojom::Container::USER_PRIVATE_WINDOWS);
 }
 
 void UserWindowControllerImpl::OnTreeChanging(const TreeChangeParams& params) {
   DCHECK(root_controller_);
   if (params.new_parent == GetUserWindowContainer()) {
     params.target->AddObserver(window_property_observer_.get());
     AssignIdIfNecessary(params.target);
     if (user_window_observer_)
       user_window_observer_->OnUserWindowAdded(GetUserWindow(params.target));
   } else if (params.old_parent == GetUserWindowContainer()) {
@@ skipping 25 matching lines @@
     user_window_observer_->OnUserWindowFocusChanged(
         lost_focus->GetLocalProperty(kUserWindowIdKey), false);
   }
   if (gained_focus) {
     user_window_observer_->OnUserWindowFocusChanged(
         gained_focus->GetLocalProperty(kUserWindowIdKey), true);
   }
 }
 
 void UserWindowControllerImpl::AddUserWindowObserver(
-    mojom::UserWindowObserverPtr observer) {
+    ash::mojom::UserWindowObserverPtr observer) {
   // TODO(msw): Support multiple observers.
   user_window_observer_ = std::move(observer);
 
   const mus::Window::Children& windows = GetUserWindowContainer()->children();
-  mojo::Array<mojom::UserWindowPtr> user_windows =
-      mojo::Array<mojom::UserWindowPtr>::New(windows.size());
+  mojo::Array<ash::mojom::UserWindowPtr> user_windows =
+      mojo::Array<ash::mojom::UserWindowPtr>::New(windows.size());
   for (size_t i = 0; i < windows.size(); ++i)
     user_windows[i] = GetUserWindow(windows[i]);
   user_window_observer_->OnUserWindowObserverAdded(std::move(user_windows));
 }
 
 void UserWindowControllerImpl::FocusUserWindow(uint32_t window_id) {
   mus::Window* window = GetUserWindowById(window_id);
   if (window)
     window->SetFocus();
 }
 
 }  // namespace wm
 }  // namespace mash