OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/mru_window_tracker.h" | 5 #include "ash/wm/mru_window_tracker.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
| 9 #include "ash/aura/wm_window_aura.h" |
9 #include "ash/common/shell_window_ids.h" | 10 #include "ash/common/shell_window_ids.h" |
10 #include "ash/common/wm/switchable_windows.h" | 11 #include "ash/common/wm/switchable_windows.h" |
11 #include "ash/common/wm/window_state.h" | 12 #include "ash/common/wm/window_state.h" |
12 #include "ash/session/session_state_delegate.h" | 13 #include "ash/session/session_state_delegate.h" |
13 #include "ash/shell.h" | 14 #include "ash/shell.h" |
14 #include "ash/wm/ash_focus_rules.h" | 15 #include "ash/wm/ash_focus_rules.h" |
15 #include "ash/wm/aura/wm_window_aura.h" | |
16 #include "ash/wm/window_util.h" | 16 #include "ash/wm/window_util.h" |
17 #include "ash/wm/workspace_controller.h" | 17 #include "ash/wm/workspace_controller.h" |
18 #include "base/bind.h" | 18 #include "base/bind.h" |
19 #include "ui/aura/window_event_dispatcher.h" | 19 #include "ui/aura/window_event_dispatcher.h" |
20 #include "ui/events/event.h" | 20 #include "ui/events/event.h" |
21 #include "ui/events/event_handler.h" | 21 #include "ui/events/event_handler.h" |
22 #include "ui/wm/public/activation_client.h" | 22 #include "ui/wm/public/activation_client.h" |
23 | 23 |
24 namespace ash { | 24 namespace ash { |
25 | 25 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 | 80 |
81 // Put the windows in the mru_windows list at the head, if it's available. | 81 // Put the windows in the mru_windows list at the head, if it's available. |
82 if (mru_windows) { | 82 if (mru_windows) { |
83 // Iterate through the list backwards, so that we can move each window to | 83 // Iterate through the list backwards, so that we can move each window to |
84 // the front of the windows list as we find them. | 84 // the front of the windows list as we find them. |
85 for (std::list<aura::Window*>::const_reverse_iterator ix = | 85 for (std::list<aura::Window*>::const_reverse_iterator ix = |
86 mru_windows->rbegin(); | 86 mru_windows->rbegin(); |
87 ix != mru_windows->rend(); ++ix) { | 87 ix != mru_windows->rend(); ++ix) { |
88 // Exclude windows in non-switchable containers and those which cannot | 88 // Exclude windows in non-switchable containers and those which cannot |
89 // be activated. | 89 // be activated. |
90 if (!wm::IsSwitchableContainer(wm::WmWindowAura::Get((*ix)->parent())) || | 90 if (!wm::IsSwitchableContainer(WmWindowAura::Get((*ix)->parent())) || |
91 !should_include_window_predicate.Run(*ix)) { | 91 !should_include_window_predicate.Run(*ix)) { |
92 continue; | 92 continue; |
93 } | 93 } |
94 | 94 |
95 MruWindowTracker::WindowList::iterator window = | 95 MruWindowTracker::WindowList::iterator window = |
96 std::find(windows.begin(), windows.end(), *ix); | 96 std::find(windows.begin(), windows.end(), *ix); |
97 if (window != windows.end()) { | 97 if (window != windows.end()) { |
98 windows.erase(window); | 98 windows.erase(window); |
99 windows.push_back(*ix); | 99 windows.push_back(*ix); |
100 } | 100 } |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 mru_windows_.remove(window); | 191 mru_windows_.remove(window); |
192 window->RemoveObserver(this); | 192 window->RemoveObserver(this); |
193 } | 193 } |
194 | 194 |
195 bool MruWindowTracker::IsWindowConsideredActivateable( | 195 bool MruWindowTracker::IsWindowConsideredActivateable( |
196 aura::Window* window) const { | 196 aura::Window* window) const { |
197 return focus_rules_->IsWindowConsideredActivatable(window); | 197 return focus_rules_->IsWindowConsideredActivatable(window); |
198 } | 198 } |
199 | 199 |
200 } // namespace ash | 200 } // namespace ash |
OLD | NEW |