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

Unified Diff: ash/shared/shell_window_ids.h

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)
Patch Set: move files to ash/shared, fix deps Created 4 years, 2 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
Index: ash/shared/shell_window_ids.h
diff --git a/ash/common/shell_window_ids.h b/ash/shared/shell_window_ids.h
similarity index 92%
rename from ash/common/shell_window_ids.h
rename to ash/shared/shell_window_ids.h
index f86084ff74db7ac96f1a7519d99b88883285dfda..5e059fdb8f68ac3db818de4e6b7f8f5ac91829a4 100644
--- a/ash/common/shell_window_ids.h
+++ b/ash/shared/shell_window_ids.h
@@ -2,13 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_COMMON_SHELL_WINDOW_IDS_H_
-#define ASH_COMMON_SHELL_WINDOW_IDS_H_
+#ifndef ASH_SHARED_SHELL_WINDOW_IDS_H_
+#define ASH_SHARED_SHELL_WINDOW_IDS_H_
#include <stddef.h>
-#include "ash/ash_export.h"
-
// Declarations of ids of special shell windows.
namespace ash {
@@ -112,12 +110,12 @@ const int kShellWindowId_Max = kShellWindowId_PowerButtonAnimationContainer;
// These are the list of container ids of containers which may contain windows
// that need to be activated.
-ASH_EXPORT extern const int kActivatableShellWindowIds[];
-ASH_EXPORT extern const size_t kNumActivatableShellWindowIds;
+extern const int kActivatableShellWindowIds[];
+extern const size_t kNumActivatableShellWindowIds;
// Returns true if |id| is in |kActivatableShellWindowIds|.
-ASH_EXPORT bool IsActivatableShellWindowId(int id);
+bool IsActivatableShellWindowId(int id);
} // namespace ash
-#endif // ASH_COMMON_SHELL_WINDOW_IDS_H_
+#endif // ASH_SHARED_SHELL_WINDOW_IDS_H_

Powered by Google App Engine
This is Rietveld 408576698