| 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/session_state_delegate.h" | 9 #include "ash/session_state_delegate.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 CHECK(active_window->layer()); | 183 CHECK(active_window->layer()); |
| 184 mru_windows_.push_front(active_window); | 184 mru_windows_.push_front(active_window); |
| 185 } | 185 } |
| 186 | 186 |
| 187 void MruWindowTracker::OnWindowActivated(aura::Window* gained_active, | 187 void MruWindowTracker::OnWindowActivated(aura::Window* gained_active, |
| 188 aura::Window* lost_active) { | 188 aura::Window* lost_active) { |
| 189 if (!ignore_window_activations_) | 189 if (!ignore_window_activations_) |
| 190 SetActiveWindow(gained_active); | 190 SetActiveWindow(gained_active); |
| 191 } | 191 } |
| 192 | 192 |
| 193 void MruWindowTracker::OnWindowDestroying(aura::Window* window) { | 193 void MruWindowTracker::OnWindowDestroyed(aura::Window* window) { |
| 194 // It's possible for OnWindowActivated() to be called after |
| 195 // OnWindowDestroying(). This means we need to override OnWindowDestroyed() |
| 196 // else we may end up with a deleted window in |mru_windows_|. |
| 194 mru_windows_.remove(window); | 197 mru_windows_.remove(window); |
| 195 window->RemoveObserver(this); | 198 window->RemoveObserver(this); |
| 196 } | 199 } |
| 197 | 200 |
| 198 } // namespace ash | 201 } // namespace ash |
| OLD | NEW |