Changes container names and adds a couple of more

mash/wm/container_ids.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 MASH_WM_CONTAINER_IDS_H_
+#define MASH_WM_CONTAINER_IDS_H_
+
+#include "mash/wm/public/interfaces/container.mojom.h"

[James Cook, 2016/05/13 19:49:12]

One thing I missed before... Do you need this include, given that you are
forward declaring Container below?

[sky, 2016/05/13 19:59:52]

Done.

+
+namespace mash {
+namespace wm {
+namespace mojom {
+enum class Container;
+}
+
+// Id used when there is no corresponding ash container.
+const int kUnknownAshId = -1;
+
+// The set of containers that allow their children to be active.
+extern const mojom::Container kActivationContainers[];
+
+// Number of kActivationContainers.
+extern const size_t kNumActivationContainers;
+
+// Converts window ids between ash (ash/wm/common/wm_shell_window_ids.h) and
+// mash.
+mojom::Container AshContainerToMashContainer(int shell_window_id);
+int MashContainerToAshContainer(mojom::Container container);
+
+}  // namespace wm
+}  // namespace mash
+
+#endif  // MASH_WM_CONTAINER_IDS_H_