| 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/session_state_delegate.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 #include "ash/shell_window_ids.h" | 11 #include "ash/shell_window_ids.h" |
| 12 #include "ash/switchable_windows.h" | 12 #include "ash/switchable_windows.h" |
| 13 #include "ash/wm/window_state.h" | 13 #include "ash/wm/window_state.h" |
| 14 #include "ash/wm/window_util.h" | 14 #include "ash/wm/window_util.h" |
| 15 #include "ash/wm/workspace_controller.h" | 15 #include "ash/wm/workspace_controller.h" |
| 16 #include "ui/aura/window_event_dispatcher.h" | 16 #include "ui/aura/window_event_dispatcher.h" |
| 17 #include "ui/events/event.h" | 17 #include "ui/events/event.h" |
| 18 #include "ui/events/event_handler.h" | 18 #include "ui/events/event_handler.h" |
| 19 #include "ui/wm/public/activation_client.h" | 19 #include "ui/wm/public/activation_client.h" |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 | 190 |
| 191 void MruWindowTracker::OnWindowDestroyed(aura::Window* window) { | 191 void MruWindowTracker::OnWindowDestroyed(aura::Window* window) { |
| 192 // It's possible for OnWindowActivated() to be called after | 192 // It's possible for OnWindowActivated() to be called after |
| 193 // OnWindowDestroying(). This means we need to override OnWindowDestroyed() | 193 // OnWindowDestroying(). This means we need to override OnWindowDestroyed() |
| 194 // else we may end up with a deleted window in |mru_windows_|. | 194 // else we may end up with a deleted window in |mru_windows_|. |
| 195 mru_windows_.remove(window); | 195 mru_windows_.remove(window); |
| 196 window->RemoveObserver(this); | 196 window->RemoveObserver(this); |
| 197 } | 197 } |
| 198 | 198 |
| 199 } // namespace ash | 199 } // namespace ash |
| OLD | NEW |