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

Side by Side 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: extra Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MASH_WM_CONTAINER_IDS_H_ 5 #ifndef MASH_WM_CONTAINER_IDS_H_
6 #define MASH_WM_CONTAINER_IDS_H_ 6 #define MASH_WM_CONTAINER_IDS_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 namespace mash { 10 namespace ash {
11 namespace wm {
12 namespace mojom { 11 namespace mojom {
13 enum class Container; 12 enum class Container;
14 } 13 }
14 }
15 15
16 namespace mash {
17 namespace wm {
16 // Id used when there is no corresponding ash container. 18 // Id used when there is no corresponding ash container.
17 const int kUnknownAshId = -1; 19 const int kUnknownAshId = -1;
18 20
19 // The set of containers that allow their children to be active. 21 // The set of containers that allow their children to be active.
20 extern const mojom::Container kActivationContainers[]; 22 extern const ash::mojom::Container kActivationContainers[];
21 23
22 // Number of kActivationContainers. 24 // Number of kActivationContainers.
23 extern const size_t kNumActivationContainers; 25 extern const size_t kNumActivationContainers;
24 26
25 // Converts window ids between ash (ash/wm/common/wm_shell_window_ids.h) and 27 // Converts window ids between ash (ash/wm/common/wm_shell_window_ids.h) and
26 // mash. 28 // mash.
27 mojom::Container AshContainerToMashContainer(int shell_window_id); 29 ash::mojom::Container AshContainerToMashContainer(int shell_window_id);
28 int MashContainerToAshContainer(mojom::Container container); 30 int MashContainerToAshContainer(ash::mojom::Container container);
29 31
30 } // namespace wm 32 } // namespace wm
31 } // namespace mash 33 } // namespace mash
32 34
33 #endif // MASH_WM_CONTAINER_IDS_H_ 35 #endif // MASH_WM_CONTAINER_IDS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698