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