Random fixes for mash bridge classes

mash/wm/container_ids.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 "mash/wm/container_ids.h"
 
 #include "ash/wm/common/wm_shell_window_ids.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 
 namespace mash {
 namespace wm {
 
 const mojom::Container kActivationContainers[] = {
     // TODO(sky): figure out right set of containers. I suspect this should be
     // all non containers.
-    mojom::Container::USER_PRIVATE,
+    mojom::Container::USER_PRIVATE_WINDOWS,
+    mojom::Container::USER_PRIVATE_ALWAYS_ON_TOP_WINDOWS,
+    mojom::Container::USER_PRIVATE_DOCKED_WINDOWS,
+    mojom::Container::USER_PRIVATE_PRESENTATION_WINDOWS,
+    mojom::Container::USER_PRIVATE_PANELS,
+    mojom::Container::USER_PRIVATE_APP_LIST,
+    mojom::Container::USER_PRIVATE_SYSTEM_MODAL,
     // Bubble windows must be allowed to activate because some of them rely on
     // deactivation to close.
     mojom::Container::BUBBLES,
 };
 
 const size_t kNumActivationContainers = arraysize(kActivationContainers);
 
 mojom::Container AshContainerToMashContainer(int ash_id) {
   switch (ash_id) {
     case ash::kShellWindowId_UnparentedControlContainer:
@@ skipping 108 matching lines @@
       return ash::kShellWindowId_DragImageAndTooltipContainer;
 
     case mojom::Container::COUNT:
       return kUnknownAshId;
   }
   return kUnknownAshId;
 }
 
 }  // namespace wm
 }  // namespace mash