Changes container names and adds a couple of more

mash/wm/property_util.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/property_util.h"
 
 #include <stdint.h>
 
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window_property.h"
@@ skipping 56 matching lines @@
         mus::mojom::WindowManager::kPreferredSize_Property);
   }
   return gfx::Size();
 }
 
 mojom::Container GetRequestedContainer(const mus::Window* window) {
   if (window->HasSharedProperty(mojom::kWindowContainer_Property)) {
     return static_cast<mojom::Container>(
         window->GetSharedProperty<int32_t>(mojom::kWindowContainer_Property));
   }
-  return mojom::Container::USER_WINDOWS;
+  return mojom::Container::USER_PRIVATE_WINDOWS;
 }
 
 int32_t GetResizeBehavior(const mus::Window* window) {
   if (window->HasSharedProperty(
           mus::mojom::WindowManager::kResizeBehavior_Property)) {
     return window->GetSharedProperty<int32_t>(
         mus::mojom::WindowManager::kResizeBehavior_Property);
   }
   return mus::mojom::kResizeBehaviorNone;
 }
@@ skipping 111 matching lines @@
 
 bool GetWindowIgnoredByShelf(mus::Window* window) {
   return window->HasSharedProperty(
              mus::mojom::WindowManager::kWindowIgnoredByShelf_Property) &&
          window->GetSharedProperty<bool>(
              mus::mojom::WindowManager::kWindowIgnoredByShelf_Property);
 }
 
 }  // namespace wm
 }  // namespace mash