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 | 9 |
10 #include "ash/accelerators/focus_manager_factory.h" | 10 #include "ash/accelerators/focus_manager_factory.h" |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
241 | 241 |
242 // Please keep in same order as in Init() because it's easy to miss one. | 242 // Please keep in same order as in Init() because it's easy to miss one. |
243 RemovePreTargetHandler(user_activity_detector_.get()); | 243 RemovePreTargetHandler(user_activity_detector_.get()); |
244 RemovePreTargetHandler(event_rewriter_filter_.get()); | 244 RemovePreTargetHandler(event_rewriter_filter_.get()); |
245 RemovePreTargetHandler(overlay_filter_.get()); | 245 RemovePreTargetHandler(overlay_filter_.get()); |
246 RemovePreTargetHandler(input_method_filter_.get()); | 246 RemovePreTargetHandler(input_method_filter_.get()); |
247 RemovePreTargetHandler(window_modality_controller_.get()); | 247 RemovePreTargetHandler(window_modality_controller_.get()); |
248 if (mouse_cursor_filter_.get()) | 248 if (mouse_cursor_filter_.get()) |
249 RemovePreTargetHandler(mouse_cursor_filter_.get()); | 249 RemovePreTargetHandler(mouse_cursor_filter_.get()); |
250 RemovePreTargetHandler(system_gesture_filter_.get()); | 250 RemovePreTargetHandler(system_gesture_filter_.get()); |
| 251 RemovePreTargetHandler(event_transformation_handler_.get()); |
251 #if !defined(OS_MACOSX) | 252 #if !defined(OS_MACOSX) |
252 RemovePreTargetHandler(accelerator_filter_.get()); | 253 RemovePreTargetHandler(accelerator_filter_.get()); |
253 #endif | 254 #endif |
254 | 255 |
255 // TooltipController is deleted with the Shell so removing its references. | 256 // TooltipController is deleted with the Shell so removing its references. |
256 RemovePreTargetHandler(tooltip_controller_.get()); | 257 RemovePreTargetHandler(tooltip_controller_.get()); |
257 | 258 |
258 // AppList needs to be released before shelf layout manager, which is | 259 // AppList needs to be released before shelf layout manager, which is |
259 // destroyed with launcher container in the loop below. However, app list | 260 // destroyed with launcher container in the loop below. However, app list |
260 // container is now on top of launcher container and released after it. | 261 // container is now on top of launcher container and released after it. |
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
944 //////////////////////////////////////////////////////////////////////////////// | 945 //////////////////////////////////////////////////////////////////////////////// |
945 // Shell, aura::client::ActivationChangeObserver implementation: | 946 // Shell, aura::client::ActivationChangeObserver implementation: |
946 | 947 |
947 void Shell::OnWindowActivated(aura::Window* gained_active, | 948 void Shell::OnWindowActivated(aura::Window* gained_active, |
948 aura::Window* lost_active) { | 949 aura::Window* lost_active) { |
949 if (gained_active) | 950 if (gained_active) |
950 active_root_window_ = gained_active->GetRootWindow(); | 951 active_root_window_ = gained_active->GetRootWindow(); |
951 } | 952 } |
952 | 953 |
953 } // namespace ash | 954 } // namespace ash |
OLD | NEW |