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

Side by Side Diff: ash/public/cpp/shell_window_ids.cc

Issue 2700523004: Remove docked windows entirely in M59. (Closed)
Patch Set: Yet another Rebase ... Created 3 years, 10 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 #include "ash/public/cpp/shell_window_ids.h" 5 #include "ash/public/cpp/shell_window_ids.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 8
9 namespace ash { 9 namespace ash {
10 10
11 // NOTE: this list is ordered by activation order. That is, windows in 11 // NOTE: this list is ordered by activation order. That is, windows in
12 // containers appearing earlier in the list are activated before windows in 12 // containers appearing earlier in the list are activated before windows in
13 // containers appearing later in the list. 13 // containers appearing later in the list.
14 const int32_t kActivatableShellWindowIds[] = { 14 const int32_t kActivatableShellWindowIds[] = {
15 kShellWindowId_OverlayContainer, kShellWindowId_LockSystemModalContainer, 15 kShellWindowId_OverlayContainer, kShellWindowId_LockSystemModalContainer,
16 kShellWindowId_SettingBubbleContainer, kShellWindowId_LockScreenContainer, 16 kShellWindowId_SettingBubbleContainer, kShellWindowId_LockScreenContainer,
17 kShellWindowId_SystemModalContainer, kShellWindowId_AlwaysOnTopContainer, 17 kShellWindowId_SystemModalContainer, kShellWindowId_AlwaysOnTopContainer,
18 kShellWindowId_AppListContainer, kShellWindowId_DefaultContainer, 18 kShellWindowId_AppListContainer, kShellWindowId_DefaultContainer,
19 19
20 // Docked, panel, launcher and status are intentionally checked after other 20 // Panel, launcher and status are intentionally checked after other
21 // containers even though these layers are higher. The user expects their 21 // containers even though these layers are higher. The user expects their
22 // windows to be focused before these elements. 22 // windows to be focused before these elements.
23 kShellWindowId_DockedContainer, kShellWindowId_PanelContainer, 23 kShellWindowId_PanelContainer, kShellWindowId_ShelfContainer,
24 kShellWindowId_ShelfContainer, kShellWindowId_StatusContainer, 24 kShellWindowId_StatusContainer,
25 }; 25 };
26 26
27 const size_t kNumActivatableShellWindowIds = 27 const size_t kNumActivatableShellWindowIds =
28 arraysize(kActivatableShellWindowIds); 28 arraysize(kActivatableShellWindowIds);
29 29
30 bool IsActivatableShellWindowId(int32_t id) { 30 bool IsActivatableShellWindowId(int32_t id) {
31 for (size_t i = 0; i < kNumActivatableShellWindowIds; i++) { 31 for (size_t i = 0; i < kNumActivatableShellWindowIds; i++) {
32 if (id == kActivatableShellWindowIds[i]) 32 if (id == kActivatableShellWindowIds[i])
33 return true; 33 return true;
34 } 34 }
35 return false; 35 return false;
36 } 36 }
37 37
38 } // namespace ash 38 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698