Moves mash/wm/public -> ash/public

mash/wm/root_window_controller.cc

Index: mash/wm/root_window_controller.cc
diff --git a/mash/wm/root_window_controller.cc b/mash/wm/root_window_controller.cc
index 7f084ff083d2735a7b83aeb30ce3b078b07f58e0..4ff690a954882bad7b49ff20efb8b99c7a89257b 100644
--- a/mash/wm/root_window_controller.cc
+++ b/mash/wm/root_window_controller.cc
@@ -44,6 +44,8 @@
 #include "services/shell/public/cpp/connector.h"
 #include "ui/display/mojo/display_type_converters.h"
 
+using ash::mojom::Container;

[msw, 2016/06/01 01:51:42]

nit: remove using or use it in more cases below?

[sky, 2016/06/01 03:30:26]

Made it used everywhere.

+
 namespace mash {
 namespace wm {
 namespace {
@@ -54,7 +56,7 @@ void AssertTrue(bool success) {
   DCHECK(success);
 }
 
-int ContainerToLocalId(mojom::Container container) {
+int ContainerToLocalId(ash::mojom::Container container) {
   return static_cast<int>(container);
 }
 
@@ -110,14 +112,14 @@ shell::Connector* RootWindowController::GetConnector() {
 }
 
 mus::Window* RootWindowController::GetWindowForContainer(
-    mojom::Container container) {
+    ash::mojom::Container container) {
   return root_->GetChildByLocalId(ContainerToLocalId(container));
 }
 
 bool RootWindowController::WindowIsContainer(const mus::Window* window) const {
   return window &&
-         window->local_id() > ContainerToLocalId(mojom::Container::ROOT) &&
-         window->local_id() < ContainerToLocalId(mojom::Container::COUNT);
+         window->local_id() > ContainerToLocalId(ash::mojom::Container::ROOT) &&
+         window->local_id() < ContainerToLocalId(ash::mojom::Container::COUNT);
 }
 
 mus::WindowManagerClient* RootWindowController::window_manager_client() {
@@ -138,13 +140,14 @@ void RootWindowController::OnAccelerator(uint32_t id, const ui::Event& event) {
 ShelfLayoutManager* RootWindowController::GetShelfLayoutManager() {
   return static_cast<ShelfLayoutManager*>(
       layout_managers_[GetWindowForContainer(
-                           mojom::Container::USER_PRIVATE_SHELF)]
+                           ash::mojom::Container::USER_PRIVATE_SHELF)]
           .get());
 }
 
 StatusLayoutManager* RootWindowController::GetStatusLayoutManager() {
   return static_cast<StatusLayoutManager*>(
-      layout_managers_[GetWindowForContainer(mojom::Container::STATUS)].get());
+      layout_managers_[GetWindowForContainer(ash::mojom::Container::STATUS)]
+          .get());
 }
 
 RootWindowController::RootWindowController(WindowManagerApplication* app)
@@ -164,7 +167,7 @@ void RootWindowController::AddAccelerators() {
 
 void RootWindowController::OnEmbed(mus::Window* root) {
   root_ = root;
-  root_->set_local_id(ContainerToLocalId(mojom::Container::ROOT));
+  root_->set_local_id(ContainerToLocalId(ash::mojom::Container::ROOT));
   root_->AddObserver(this);
   layout_managers_[root_].reset(new FillLayout(root_));
 
@@ -230,8 +233,8 @@ void RootWindowController::OnShelfWindowAvailable() {
 }
 
 void RootWindowController::CreateContainer(
-    mash::wm::mojom::Container container,
-    mash::wm::mojom::Container parent_container) {
+    ash::mojom::Container container,
+    ash::mojom::Container parent_container) {
   // Set the window's name to the container name (e.g. "Container::LOGIN"),
   // which makes the window hierarchy easier to read.
   std::map<std::string, std::vector<uint8_t>> properties;
@@ -251,7 +254,8 @@ void RootWindowController::CreateContainer(
   // however, usually assume the screen is unlocked.
   const bool is_test = base::CommandLine::ForCurrentProcess()->HasSwitch(
       mus::switches::kUseTestConfig);
-  window->SetVisible(container != mojom::Container::USER_PRIVATE || is_test);
+  window->SetVisible(container != ash::mojom::Container::USER_PRIVATE ||
+                     is_test);
 
   mus::Window* parent =
       root_->GetChildByLocalId(ContainerToLocalId(parent_container));
@@ -259,61 +263,55 @@ void RootWindowController::CreateContainer(
 }
 
 void RootWindowController::CreateContainers() {
-  CreateContainer(mojom::Container::ALL_USER_BACKGROUND,
-                  mojom::Container::ROOT);
-  CreateContainer(mojom::Container::USER, mojom::Container::ROOT);
-  CreateContainer(mojom::Container::USER_BACKGROUND, mojom::Container::USER);
-  CreateContainer(mojom::Container::USER_PRIVATE, mojom::Container::USER);
-  CreateContainer(mojom::Container::USER_PRIVATE_WINDOWS,
-                  mojom::Container::USER_PRIVATE);
-  CreateContainer(mojom::Container::USER_PRIVATE_ALWAYS_ON_TOP_WINDOWS,
-                  mojom::Container::USER_PRIVATE);
-  CreateContainer(mojom::Container::USER_PRIVATE_DOCKED_WINDOWS,
-                  mojom::Container::USER_PRIVATE);
-  CreateContainer(mojom::Container::USER_PRIVATE_PRESENTATION_WINDOWS,
-                  mojom::Container::USER_PRIVATE);
-  CreateContainer(mojom::Container::USER_PRIVATE_SHELF,
-                  mojom::Container::USER_PRIVATE);
-  CreateContainer(mojom::Container::USER_PRIVATE_PANELS,
-                  mojom::Container::USER_PRIVATE);
-  CreateContainer(mojom::Container::USER_PRIVATE_APP_LIST,
-                  mojom::Container::USER_PRIVATE);
-  CreateContainer(mojom::Container::USER_PRIVATE_SYSTEM_MODAL,
-                  mojom::Container::USER_PRIVATE);
-  CreateContainer(mojom::Container::LOGIN, mojom::Container::ROOT);
-  CreateContainer(mojom::Container::LOGIN_WINDOWS, mojom::Container::LOGIN);
-  CreateContainer(mojom::Container::LOGIN_APP, mojom::Container::LOGIN);
-  CreateContainer(mojom::Container::LOGIN_SHELF, mojom::Container::LOGIN);
-  CreateContainer(mojom::Container::STATUS, mojom::Container::ROOT);
-  CreateContainer(mojom::Container::BUBBLES, mojom::Container::ROOT);
-  CreateContainer(mojom::Container::SYSTEM_MODAL_WINDOWS,
-                  mojom::Container::ROOT);
-  CreateContainer(mojom::Container::KEYBOARD, mojom::Container::ROOT);
-  CreateContainer(mojom::Container::MENUS, mojom::Container::ROOT);
-  CreateContainer(mojom::Container::DRAG_AND_TOOLTIPS, mojom::Container::ROOT);
+  CreateContainer(Container::ALL_USER_BACKGROUND, Container::ROOT);
+  CreateContainer(Container::USER, Container::ROOT);
+  CreateContainer(Container::USER_BACKGROUND, Container::USER);
+  CreateContainer(Container::USER_PRIVATE, Container::USER);
+  CreateContainer(Container::USER_PRIVATE_WINDOWS, Container::USER_PRIVATE);
+  CreateContainer(Container::USER_PRIVATE_ALWAYS_ON_TOP_WINDOWS,
+                  Container::USER_PRIVATE);
+  CreateContainer(Container::USER_PRIVATE_DOCKED_WINDOWS,
+                  Container::USER_PRIVATE);
+  CreateContainer(Container::USER_PRIVATE_PRESENTATION_WINDOWS,
+                  Container::USER_PRIVATE);
+  CreateContainer(Container::USER_PRIVATE_SHELF, Container::USER_PRIVATE);
+  CreateContainer(Container::USER_PRIVATE_PANELS, Container::USER_PRIVATE);
+  CreateContainer(Container::USER_PRIVATE_APP_LIST, Container::USER_PRIVATE);
+  CreateContainer(Container::USER_PRIVATE_SYSTEM_MODAL,
+                  Container::USER_PRIVATE);
+  CreateContainer(Container::LOGIN, Container::ROOT);
+  CreateContainer(Container::LOGIN_WINDOWS, Container::LOGIN);
+  CreateContainer(Container::LOGIN_APP, Container::LOGIN);
+  CreateContainer(Container::LOGIN_SHELF, Container::LOGIN);
+  CreateContainer(Container::STATUS, Container::ROOT);
+  CreateContainer(Container::BUBBLES, Container::ROOT);
+  CreateContainer(Container::SYSTEM_MODAL_WINDOWS, Container::ROOT);
+  CreateContainer(Container::KEYBOARD, Container::ROOT);
+  CreateContainer(Container::MENUS, Container::ROOT);
+  CreateContainer(Container::DRAG_AND_TOOLTIPS, Container::ROOT);
 
   // Override the default layout managers for certain containers.
   mus::Window* user_background =
-      GetWindowForContainer(mojom::Container::USER_BACKGROUND);
+      GetWindowForContainer(Container::USER_BACKGROUND);
   layout_managers_[user_background].reset(
       new BackgroundLayout(user_background));
 
-  mus::Window* login_app = GetWindowForContainer(mojom::Container::LOGIN_APP);
+  mus::Window* login_app = GetWindowForContainer(Container::LOGIN_APP);
   layout_managers_[login_app].reset(new ScreenlockLayout(login_app));
 
   mus::Window* user_shelf =
-      GetWindowForContainer(mojom::Container::USER_PRIVATE_SHELF);
+      GetWindowForContainer(Container::USER_PRIVATE_SHELF);
   ShelfLayoutManager* shelf_layout_manager =
       new ShelfLayoutManager(user_shelf, this);
   layout_managers_[user_shelf].reset(shelf_layout_manager);
 
   wm_shelf_.reset(new WmShelfMus(shelf_layout_manager));
 
-  mus::Window* status = GetWindowForContainer(mojom::Container::STATUS);
+  mus::Window* status = GetWindowForContainer(Container::STATUS);
   layout_managers_[status].reset(new StatusLayoutManager(status));
 
   mus::Window* user_private_windows =
-      GetWindowForContainer(mojom::Container::USER_PRIVATE_WINDOWS);
+      GetWindowForContainer(Container::USER_PRIVATE_WINDOWS);
   // WorkspaceLayoutManager is not a mash::wm::LayoutManager (it's an
   // ash::wm::LayoutManager), so it can't be in |layout_managers_|.
   layout_managers_.erase(user_private_windows);
@@ -329,7 +327,7 @@ void RootWindowController::CreateContainers() {
           std::move(workspace_layout_manager_delegate))));
 
   mus::Window* user_private_docked_windows =
-      GetWindowForContainer(mojom::Container::USER_PRIVATE_DOCKED_WINDOWS);
+      GetWindowForContainer(Container::USER_PRIVATE_DOCKED_WINDOWS);
   WmWindowMus* user_private_docked_windows_wm =
       WmWindowMus::Get(user_private_docked_windows);
   user_private_docked_windows_wm->SetSnapsChildrenToPhysicalPixelBoundary();
@@ -339,7 +337,7 @@ void RootWindowController::CreateContainers() {
       new ash::DockedWindowLayoutManager(user_private_docked_windows_wm)));
 
   mus::Window* user_private_panels =
-      GetWindowForContainer(mojom::Container::USER_PRIVATE_PANELS);
+      GetWindowForContainer(Container::USER_PRIVATE_PANELS);
   WmWindowMus* user_private_panels_wm = WmWindowMus::Get(user_private_panels);
   user_private_panels_wm->SetSnapsChildrenToPhysicalPixelBoundary();
   layout_managers_.erase(user_private_panels);
@@ -347,8 +345,8 @@ void RootWindowController::CreateContainers() {
   user_private_panels_wm->SetLayoutManager(
       base::WrapUnique(new ash::PanelLayoutManager(user_private_panels_wm)));
 
-  mus::Window* user_private_always_on_top = GetWindowForContainer(
-      mojom::Container::USER_PRIVATE_ALWAYS_ON_TOP_WINDOWS);
+  mus::Window* user_private_always_on_top =
+      GetWindowForContainer(Container::USER_PRIVATE_ALWAYS_ON_TOP_WINDOWS);
   WmWindowMus* user_private_always_on_top_wm =
       WmWindowMus::Get(user_private_always_on_top);
   user_private_always_on_top_wm->SetChildrenUseExtendedHitRegion();