Changes container names and adds a couple of more

mash/wm/window_manager.cc

Index: mash/wm/window_manager.cc
diff --git a/mash/wm/window_manager.cc b/mash/wm/window_manager.cc
index e2c1379e6a6e7bcd96253ef37c3b3d5c06995a71..4e3e9b0a69bc44e099cf7f3be4705a65a9be0031 100644
--- a/mash/wm/window_manager.cc
+++ b/mash/wm/window_manager.cc
@@ -41,8 +41,8 @@ void WindowManager::Initialize(RootWindowController* 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;
-       ++id) {
+  for (int id = static_cast<int>(mojom::Container::ROOT_CONTAINER) + 1;
+       id < count; ++id) {
     mus::Window* container = root_controller_->GetWindowForContainer(
         static_cast<mojom::Container>(id));
     Add(container);
@@ -175,9 +175,9 @@ void WindowManager::OnAccelerator(uint32_t id, const ui::Event& event) {
 }
 
 void WindowManager::ScreenlockStateChanged(bool locked) {
-  // Hide USER_PRIVATE windows when the screen is locked.
+  // Hide USER_PRIVATE_CONTAINER windows when the screen is locked.
   mus::Window* window = root_controller_->GetWindowForContainer(
-      mash::wm::mojom::Container::USER_PRIVATE);
+      mash::wm::mojom::Container::USER_PRIVATE_CONTAINER);
   window->SetVisible(!locked);
 }