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

Side by Side Diff: ash/wm/ash_focus_rules.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/wm/ash_focus_rules.h" 5 #include "ash/wm/ash_focus_rules.h"
6 6
7 #include "ash/public/cpp/shell_window_ids.h" 7 #include "ash/public/cpp/shell_window_ids.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_port.h"
9 #include "ash/wm/container_finder.h" 10 #include "ash/wm/container_finder.h"
10 #include "ash/wm/focus_rules.h" 11 #include "ash/wm/focus_rules.h"
11 #include "ash/wm/mru_window_tracker.h" 12 #include "ash/wm/mru_window_tracker.h"
12 #include "ash/wm/window_state.h" 13 #include "ash/wm/window_state.h"
13 #include "ash/wm/window_state_aura.h" 14 #include "ash/wm/window_state_aura.h"
14 #include "ash/wm_shell.h"
15 #include "ash/wm_window.h" 15 #include "ash/wm_window.h"
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 17
18 namespace ash { 18 namespace ash {
19 namespace wm { 19 namespace wm {
20 namespace { 20 namespace {
21 21
22 bool BelongsToContainerWithEqualOrGreaterId(const aura::Window* window, 22 bool BelongsToContainerWithEqualOrGreaterId(const aura::Window* window,
23 int container_id) { 23 int container_id) {
24 for (; window; window = window->parent()) { 24 for (; window; window = window->parent()) {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 } 58 }
59 59
60 bool AshFocusRules::CanActivateWindow(aura::Window* window) const { 60 bool AshFocusRules::CanActivateWindow(aura::Window* window) const {
61 // Clearing activation is always permissible. 61 // Clearing activation is always permissible.
62 if (!window) 62 if (!window)
63 return true; 63 return true;
64 64
65 if (!BaseFocusRules::CanActivateWindow(window)) 65 if (!BaseFocusRules::CanActivateWindow(window))
66 return false; 66 return false;
67 67
68 if (WmShell::Get()->IsSystemModalWindowOpen()) { 68 if (ShellPort::Get()->IsSystemModalWindowOpen()) {
69 return BelongsToContainerWithEqualOrGreaterId( 69 return BelongsToContainerWithEqualOrGreaterId(
70 window, kShellWindowId_SystemModalContainer); 70 window, kShellWindowId_SystemModalContainer);
71 } 71 }
72 72
73 return true; 73 return true;
74 } 74 }
75 75
76 aura::Window* AshFocusRules::GetNextActivatableWindow( 76 aura::Window* AshFocusRules::GetNextActivatableWindow(
77 aura::Window* ignore) const { 77 aura::Window* ignore) const {
78 DCHECK(ignore); 78 DCHECK(ignore);
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 WindowState* window_state = GetWindowState(*i); 139 WindowState* window_state = GetWindowState(*i);
140 if (*i != ignore && window_state->CanActivate() && 140 if (*i != ignore && window_state->CanActivate() &&
141 !window_state->IsMinimized()) 141 !window_state->IsMinimized())
142 return *i; 142 return *i;
143 } 143 }
144 return NULL; 144 return NULL;
145 } 145 }
146 146
147 } // namespace wm 147 } // namespace wm
148 } // namespace ash 148 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698