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

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

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 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/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/wm/mru_window_tracker.h" 10 #include "ash/wm/mru_window_tracker.h"
11 #include "ash/wm/window_state.h" 11 #include "ash/wm/window_state.h"
12 #include "ash/wm/window_state_aura.h"
12 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
13 14
14 namespace ash { 15 namespace ash {
15 namespace wm { 16 namespace wm {
16 namespace { 17 namespace {
17 18
18 // These are the list of container ids of containers which may contain windows 19 // These are the list of container ids of containers which may contain windows
19 // that need to be activated in the order that they should be activated. 20 // that need to be activated in the order that they should be activated.
20 const int kWindowContainerIds[] = { 21 const int kWindowContainerIds[] = {
21 kShellWindowId_OverlayContainer, 22 kShellWindowId_OverlayContainer,
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 if (*i != ignore && 183 if (*i != ignore &&
183 window_state->CanActivate() && 184 window_state->CanActivate() &&
184 !window_state->IsMinimized()) 185 !window_state->IsMinimized())
185 return *i; 186 return *i;
186 } 187 }
187 return NULL; 188 return NULL;
188 } 189 }
189 190
190 } // namespace wm 191 } // namespace wm
191 } // namespace ash 192 } // 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