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

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

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 5 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/aura/wm_window_aura.h" 7 #include "ash/aura/wm_window_aura.h"
8 #include "ash/common/shell_window_ids.h" 8 #include "ash/common/shell_window_ids.h"
9 #include "ash/common/wm/focus_rules.h" 9 #include "ash/common/wm/focus_rules.h"
10 #include "ash/common/wm/mru_window_tracker.h" 10 #include "ash/common/wm/mru_window_tracker.h"
11 #include "ash/common/wm/window_state.h" 11 #include "ash/common/wm/window_state.h"
12 #include "ash/common/wm_shell.h" 12 #include "ash/common/wm_shell.h"
13 #include "ash/shell.h" 13 #include "ash/shell.h"
14 #include "ash/shell_delegate.h"
15 #include "ash/wm/window_state_aura.h" 14 #include "ash/wm/window_state_aura.h"
16 #include "ui/aura/window.h" 15 #include "ui/aura/window.h"
17 16
18 namespace ash { 17 namespace ash {
19 namespace wm { 18 namespace wm {
20 namespace { 19 namespace {
21 20
22 bool BelongsToContainerWithEqualOrGreaterId(const aura::Window* window, 21 bool BelongsToContainerWithEqualOrGreaterId(const aura::Window* window,
23 int container_id) { 22 int container_id) {
24 for (; window; window = window->parent()) { 23 for (; window; window = window->parent()) {
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 WindowState* window_state = GetWindowState(*i); 137 WindowState* window_state = GetWindowState(*i);
139 if (*i != ignore && window_state->CanActivate() && 138 if (*i != ignore && window_state->CanActivate() &&
140 !window_state->IsMinimized()) 139 !window_state->IsMinimized())
141 return *i; 140 return *i;
142 } 141 }
143 return NULL; 142 return NULL;
144 } 143 }
145 144
146 } // namespace wm 145 } // namespace wm
147 } // namespace ash 146 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698