OLD | NEW |
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/shell.h" | 5 #include "ash/shell.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
11 #include "ash/accelerators/accelerator_controller.h" | 11 #include "ash/accelerators/accelerator_controller.h" |
12 #include "ash/accelerators/accelerator_delegate.h" | 12 #include "ash/accelerators/accelerator_delegate.h" |
13 #include "ash/accelerators/focus_manager_factory.h" | 13 #include "ash/accelerators/focus_manager_factory.h" |
14 #include "ash/aura/wm_shell_aura.h" | 14 #include "ash/aura/wm_shell_aura.h" |
15 #include "ash/aura/wm_window_aura.h" | 15 #include "ash/aura/wm_window_aura.h" |
16 #include "ash/autoclick/autoclick_controller.h" | 16 #include "ash/autoclick/autoclick_controller.h" |
| 17 #include "ash/common/accessibility_delegate.h" |
17 #include "ash/common/ash_switches.h" | 18 #include "ash/common/ash_switches.h" |
18 #include "ash/common/session/session_state_delegate.h" | 19 #include "ash/common/session/session_state_delegate.h" |
19 #include "ash/common/shelf/shelf_item_delegate.h" | 20 #include "ash/common/shelf/shelf_item_delegate.h" |
20 #include "ash/common/shelf/shelf_item_delegate_manager.h" | 21 #include "ash/common/shelf/shelf_item_delegate_manager.h" |
21 #include "ash/common/shelf/shelf_model.h" | 22 #include "ash/common/shelf/shelf_model.h" |
22 #include "ash/common/shell_window_ids.h" | 23 #include "ash/common/shell_window_ids.h" |
23 #include "ash/common/system/tray/system_tray_delegate.h" | 24 #include "ash/common/system/tray/system_tray_delegate.h" |
24 #include "ash/common/wm/mru_window_tracker.h" | 25 #include "ash/common/wm/mru_window_tracker.h" |
25 #include "ash/common/wm/root_window_finder.h" | 26 #include "ash/common/wm/root_window_finder.h" |
26 #include "ash/common/wm/window_positioner.h" | 27 #include "ash/common/wm/window_positioner.h" |
(...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1215 | 1216 |
1216 void Shell::OnWindowActivated( | 1217 void Shell::OnWindowActivated( |
1217 aura::client::ActivationChangeObserver::ActivationReason reason, | 1218 aura::client::ActivationChangeObserver::ActivationReason reason, |
1218 aura::Window* gained_active, | 1219 aura::Window* gained_active, |
1219 aura::Window* lost_active) { | 1220 aura::Window* lost_active) { |
1220 if (gained_active) | 1221 if (gained_active) |
1221 target_root_window_ = gained_active->GetRootWindow(); | 1222 target_root_window_ = gained_active->GetRootWindow(); |
1222 } | 1223 } |
1223 | 1224 |
1224 } // namespace ash | 1225 } // namespace ash |
OLD | NEW |