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

Unified Diff: ash/common/shell_window_ids.cc

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)
Patch Set: rebase 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
« no previous file with comments | « ash/common/shell_window_ids.h ('k') | ash/common/system/chromeos/ime_menu/ime_menu_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shell_window_ids.cc
diff --git a/ash/common/shell_window_ids.cc b/ash/common/shell_window_ids.cc
deleted file mode 100644
index 27fdf89b48dd27855be4b0f51f8bf7a56ee33653..0000000000000000000000000000000000000000
--- a/ash/common/shell_window_ids.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-// 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 "ash/common/shell_window_ids.h"
-
-#include "base/macros.h"
-
-namespace ash {
-
-// NOTE: this list is ordered by activation order. That is, windows in
-// containers appearing earlier in the list are activated before windows in
-// containers appearing later in the list.
-const int kActivatableShellWindowIds[] = {
- kShellWindowId_OverlayContainer, kShellWindowId_LockSystemModalContainer,
- kShellWindowId_SettingBubbleContainer, kShellWindowId_LockScreenContainer,
- kShellWindowId_SystemModalContainer, kShellWindowId_AlwaysOnTopContainer,
- kShellWindowId_AppListContainer, kShellWindowId_DefaultContainer,
-
- // Docked, panel, launcher and status are intentionally checked after other
- // containers even though these layers are higher. The user expects their
- // windows to be focused before these elements.
- kShellWindowId_DockedContainer, kShellWindowId_PanelContainer,
- kShellWindowId_ShelfContainer, kShellWindowId_StatusContainer,
-};
-
-const size_t kNumActivatableShellWindowIds =
- arraysize(kActivatableShellWindowIds);
-
-bool IsActivatableShellWindowId(int id) {
- for (size_t i = 0; i < kNumActivatableShellWindowIds; i++) {
- if (id == kActivatableShellWindowIds[i])
- return true;
- }
- return false;
-}
-
-} // namespace ash
« no previous file with comments | « ash/common/shell_window_ids.h ('k') | ash/common/system/chromeos/ime_menu/ime_menu_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698