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

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « ash/wm/always_on_top_controller_unittest.cc ('k') | ash/wm/ash_focus_rules_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/wm_shell.h"
8 #include "ash/common/wm_window.h"
7 #include "ash/public/cpp/shell_window_ids.h" 9 #include "ash/public/cpp/shell_window_ids.h"
8 #include "ash/shell.h" 10 #include "ash/shell.h"
9 #include "ash/wm/container_finder.h" 11 #include "ash/wm/container_finder.h"
10 #include "ash/wm/focus_rules.h" 12 #include "ash/wm/focus_rules.h"
11 #include "ash/wm/mru_window_tracker.h" 13 #include "ash/wm/mru_window_tracker.h"
12 #include "ash/wm/window_state.h" 14 #include "ash/wm/window_state.h"
13 #include "ash/wm/window_state_aura.h" 15 #include "ash/wm/window_state_aura.h"
14 #include "ash/wm_shell.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()) {
25 if (window->id() >= container_id) 25 if (window->id() >= container_id)
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 WindowState* window_state = GetWindowState(*i); 140 WindowState* window_state = GetWindowState(*i);
141 if (*i != ignore && window_state->CanActivate() && 141 if (*i != ignore && window_state->CanActivate() &&
142 !window_state->IsMinimized()) 142 !window_state->IsMinimized())
143 return *i; 143 return *i;
144 } 144 }
145 return NULL; 145 return NULL;
146 } 146 }
147 147
148 } // namespace wm 148 } // namespace wm
149 } // namespace ash 149 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/always_on_top_controller_unittest.cc ('k') | ash/wm/ash_focus_rules_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698