mash: Use ash shell window container ids instead of ash::mojom::Container

ash/mus/root_window_controller.cc

 // Copyright 2016 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 "ash/mus/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/common/shelf/shelf_layout_manager.h"
-#include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #include "ash/common/wm/root_window_layout_manager.h"
 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
 #include "ash/mus/bridge/wm_shelf_mus.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
-#include "ash/mus/container_ids.h"
 #include "ash/mus/non_client_frame_controller.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/screenlock_layout.h"
 #include "ash/mus/window_manager.h"
+#include "ash/public/cpp/shell_window_ids.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/common/switches.h"
 #include "services/ui/common/util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_property.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "ui/display/display_list.h"
 #include "ui/display/screen_base.h"
 
-using ash::mojom::Container;
-
 namespace ash {
 namespace mus {
 
 RootWindowController::RootWindowController(WindowManager* window_manager,
                                            ui::Window* root,
                                            const display::Display& display)
     : window_manager_(window_manager),
       root_(root),
       window_count_(0),
       display_(display),
@@ skipping 37 matching lines @@
       GetWindowType(*properties) == ui::mojom::WindowType::WINDOW ||
       GetWindowType(*properties) == ui::mojom::WindowType::PANEL;
   if (provide_non_client_frame)
     (*properties)[ui::mojom::kWaitForUnderlay_Property].clear();
 
   // TODO(sky): constrain and validate properties before passing to server.
   ui::Window* window = root_->window_tree()->NewWindow(properties);
   window->SetBounds(CalculateDefaultBounds(window));
 
   ui::Window* container_window = nullptr;
-  mojom::Container container;
-  if (GetRequestedContainer(window, &container)) {
-    container_window = GetWindowForContainer(container);
+  int container_id = kShellWindowId_Invalid;
+  if (GetRequestedContainer(window, &container_id)) {
+    container_window = GetWindowByShellWindowId(container_id)->mus_window();
   } else {
     // TODO(sky): window->bounds() isn't quite right.
     container_window = WmWindowMus::GetMusWindow(wm::GetDefaultParent(
         WmWindowMus::Get(root_), WmWindowMus::Get(window), window->bounds()));
   }
   DCHECK(WmWindowMus::Get(container_window)->IsContainer());
 
   if (provide_non_client_frame) {
     NonClientFrameController::Create(container_window, window,
                                      window_manager_->window_manager_client());
   } else {
     container_window->AddChild(window);
   }
 
   window_count_++;
 
   return window;
 }
 
-ui::Window* RootWindowController::GetWindowForContainer(Container container) {
-  WmWindowMus* wm_window =
-      GetWindowByShellWindowId(MashContainerToAshShellWindowId(container));
-  DCHECK(wm_window);
-  return wm_window->mus_window();
-}
-
 WmWindowMus* RootWindowController::GetWindowByShellWindowId(int id) {
   return WmWindowMus::AsWmWindowMus(
       WmWindowMus::Get(root_)->GetChildByShellWindowId(id));
 }
 
 void RootWindowController::SetWorkAreaInests(const gfx::Insets& insets) {
   display_.UpdateWorkAreaFromInsets(insets);
   display::DisplayList* display_list =
       window_manager_->screen()->display_list();
   auto iter = display_list->FindDisplayById(display_.id());
@@ skipping 37 matching lines @@
 void RootWindowController::CreateLayoutManagers() {
   // Override the default layout managers for certain containers.
   WmWindowMus* lock_screen_container =
       GetWindowByShellWindowId(kShellWindowId_LockScreenContainer);
   layout_managers_[lock_screen_container->mus_window()].reset(
       new ScreenlockLayout(lock_screen_container->mus_window()));
 }
 
 }  // namespace mus
 }  // namespace ash