Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Unified Diff: mash/wm/container_ids.h

Issue 2024313002: Moves mash/wm/public -> ash/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mash/wm/bridge/wm_globals_mus.cc ('k') | mash/wm/container_ids.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/container_ids.h
diff --git a/mash/wm/container_ids.h b/mash/wm/container_ids.h
index 432f0fec01d4bf3369c2781b11c81911c4fbf436..0fa215c80b591eb03771d9fea427c1965794bce5 100644
--- a/mash/wm/container_ids.h
+++ b/mash/wm/container_ids.h
@@ -7,25 +7,27 @@
#include <stddef.h>
-namespace mash {
-namespace wm {
+namespace ash {
namespace mojom {
enum class Container;
}
+}
+namespace mash {
+namespace wm {
// 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[];
+extern const ash::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);
+ash::mojom::Container AshContainerToMashContainer(int shell_window_id);
+int MashContainerToAshContainer(ash::mojom::Container container);
} // namespace wm
} // namespace mash
« no previous file with comments | « mash/wm/bridge/wm_globals_mus.cc ('k') | mash/wm/container_ids.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698