Changes container names and adds a couple of more

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>
 
@@ skipping 23 matching lines @@
 
 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;
-       ++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);
 
     // 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 112 matching lines @@
 mus::Window* WindowManager::OnWmCreateTopLevelWindow(
     std::map<std::string, std::vector<uint8_t>>* properties) {
   return NewTopLevelWindow(properties);
 }
 
 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 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);
 }
 
 }  // namespace wm
 }  // namespace mash