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

ash/mus/bridge/wm_window_mus.h

 // 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.
 
 #ifndef ASH_MUS_BRIDGE_WM_WINDOW_MUS_H_
 #define ASH_MUS_BRIDGE_WM_WINDOW_MUS_H_
 
 #include <memory>
 
-#include "ash/common/shell_window_ids.h"
 #include "ash/common/wm_window.h"
+#include "ash/public/cpp/shell_window_ids.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "services/ui/public/cpp/window_observer.h"
 
 namespace views {
 class Widget;
 }
 
 namespace ash {
 
@@ skipping 246 matching lines @@
   void OnWindowVisibilityChanging(ui::Window* window, bool visible) override;
   void OnWindowVisibilityChanged(ui::Window* window, bool visible) override;
   void OnTransientChildAdded(ui::Window* window,
                              ui::Window* transient) override;
   void OnTransientChildRemoved(ui::Window* window,
                                ui::Window* transient) override;
 
   ui::Window* window_;
 
   // The shell window id of this window. Shell window ids are defined in
-  // ash/common/shell_window_ids.h.
+  // ash/public/cpp/shell_window_ids.h.
   int shell_window_id_ = kShellWindowId_Invalid;
 
   std::unique_ptr<wm::WindowState> window_state_;
 
   views::Widget* widget_ = nullptr;
 
   WidgetCreationType widget_creation_type_ = WidgetCreationType::INTERNAL;
 
   base::ObserverList<WmWindowObserver> observers_;
 
@@ skipping 21 matching lines @@
 
   bool locked_to_root_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(WmWindowMus);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_BRIDGE_WM_WINDOW_MUS_H_