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

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

Issue 2889413002: chromeos: nukes window_state_aura (Closed)
Patch Set: merge, remove include from windows and shuffle functions for declaration Created 3 years, 7 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/shell_port.h"
10 #include "ash/wm/container_finder.h" 10 #include "ash/wm/container_finder.h"
11 #include "ash/wm/focus_rules.h" 11 #include "ash/wm/focus_rules.h"
12 #include "ash/wm/mru_window_tracker.h" 12 #include "ash/wm/mru_window_tracker.h"
13 #include "ash/wm/window_state.h" 13 #include "ash/wm/window_state.h"
14 #include "ash/wm/window_state_aura.h"
15 #include "ash/wm_window.h" 14 #include "ash/wm_window.h"
16 #include "ui/aura/client/aura_constants.h" 15 #include "ui/aura/client/aura_constants.h"
17 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
18 #include "ui/events/event.h" 17 #include "ui/events/event.h"
19 18
20 namespace ash { 19 namespace ash {
21 namespace wm { 20 namespace wm {
22 namespace { 21 namespace {
23 22
24 bool BelongsToContainerWithEqualOrGreaterId(const aura::Window* window, 23 bool BelongsToContainerWithEqualOrGreaterId(const aura::Window* window,
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 WindowState* window_state = GetWindowState(*i); 149 WindowState* window_state = GetWindowState(*i);
151 if (*i != ignore && window_state->CanActivate() && 150 if (*i != ignore && window_state->CanActivate() &&
152 !window_state->IsMinimized()) 151 !window_state->IsMinimized())
153 return *i; 152 return *i;
154 } 153 }
155 return nullptr; 154 return nullptr;
156 } 155 }
157 156
158 } // namespace wm 157 } // namespace wm
159 } // namespace ash 158 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/web_notification/web_notification_tray_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