Moves mash/wm/public -> ash/public

mash/wm/window_manager.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/window_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
+#include "ash/public/interfaces/container.mojom.h"
 #include "ash/wm/common/container_finder.h"
 #include "components/mus/common/types.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 "components/mus/public/interfaces/input_events.mojom.h"
 #include "components/mus/public/interfaces/mus_constants.mojom.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "mash/wm/bridge/wm_window_mus.h"
 #include "mash/wm/non_client_frame_controller.h"
 #include "mash/wm/property_util.h"
-#include "mash/wm/public/interfaces/container.mojom.h"
 #include "mash/wm/root_window_controller.h"
 
 namespace mash {
 namespace wm {
 
 WindowManager::WindowManager()
     : root_controller_(nullptr),
       window_manager_client_(nullptr),
       binding_(this) {}
 
 WindowManager::~WindowManager() {
 }
 
 void WindowManager::Initialize(RootWindowController* root_controller,
                                session::mojom::Session* session) {
   DCHECK(root_controller);
   DCHECK(!root_controller_);
   root_controller_ = root_controller;
 
   // Observe all the containers so that windows can be added to/removed from the
   // |disconnected_app_handler_|.
-  int count = static_cast<int>(mojom::Container::COUNT);
-  for (int id = static_cast<int>(mojom::Container::ROOT) + 1; id < count;
+  int count = static_cast<int>(ash::mojom::Container::COUNT);
+  for (int id = static_cast<int>(ash::mojom::Container::ROOT) + 1; id < count;
        ++id) {
     mus::Window* container = root_controller_->GetWindowForContainer(
-        static_cast<mojom::Container>(id));
+        static_cast<ash::mojom::Container>(id));
     Add(container);
 
     // Add any pre-existing windows in the container to
     // |disconnected_app_handler_|.
     for (auto child : container->children()) {
       if (!root_controller_->WindowIsContainer(child))
         disconnected_app_handler_.Add(child);
     }
   }
 
@@ skipping 26 matching lines @@
       GetWindowType(*properties) == mus::mojom::WindowType::WINDOW ||
       GetWindowType(*properties) == mus::mojom::WindowType::PANEL;
   if (provide_non_client_frame)
     (*properties)[mus::mojom::kWaitForUnderlay_Property].clear();
 
   // TODO(sky): constrain and validate properties before passing to server.
   mus::Window* window = root->window_tree()->NewWindow(properties);
   window->SetBounds(CalculateDefaultBounds(window));
 
   mus::Window* container_window = nullptr;
-  if (window->HasSharedProperty(mojom::kWindowContainer_Property)) {
+  if (window->HasSharedProperty(ash::mojom::kWindowContainer_Property)) {
     container_window =
         root_controller_->GetWindowForContainer(GetRequestedContainer(window));
   } else {
     // TODO(sky): window->bounds() isn't quite right.
     container_window = WmWindowMus::GetMusWindow(
         ash::wm::GetDefaultParent(WmWindowMus::Get(root_controller_->root()),
                                   WmWindowMus::Get(window), window->bounds()));
   }
   DCHECK(root_controller_->WindowIsContainer(container_window));
 
@@ skipping 90 matching lines @@
     SetWindowIsJanky(window, janky);
 }
 
 void WindowManager::OnAccelerator(uint32_t id, const ui::Event& event) {
   root_controller_->OnAccelerator(id, std::move(event));
 }
 
 void WindowManager::ScreenlockStateChanged(bool locked) {
   // Hide USER_PRIVATE_CONTAINER windows when the screen is locked.
   mus::Window* window = root_controller_->GetWindowForContainer(
-      mash::wm::mojom::Container::USER_PRIVATE);
+      ash::mojom::Container::USER_PRIVATE);
   window->SetVisible(!locked);
 }
 
 }  // namespace wm
 }  // namespace mash