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/accelerator_controller.h" | 10 #include "ash/accelerators/accelerator_controller.h" |
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
656 #endif | 656 #endif |
657 RemovePreTargetHandler(user_activity_detector_.get()); | 657 RemovePreTargetHandler(user_activity_detector_.get()); |
658 RemovePreTargetHandler(overlay_filter_.get()); | 658 RemovePreTargetHandler(overlay_filter_.get()); |
659 RemovePreTargetHandler(input_method_filter_.get()); | 659 RemovePreTargetHandler(input_method_filter_.get()); |
660 RemovePreTargetHandler(accelerator_filter_.get()); | 660 RemovePreTargetHandler(accelerator_filter_.get()); |
661 RemovePreTargetHandler(event_transformation_handler_.get()); | 661 RemovePreTargetHandler(event_transformation_handler_.get()); |
662 RemovePreTargetHandler(toplevel_window_event_handler_.get()); | 662 RemovePreTargetHandler(toplevel_window_event_handler_.get()); |
663 RemovePostTargetHandler(toplevel_window_event_handler_.get()); | 663 RemovePostTargetHandler(toplevel_window_event_handler_.get()); |
664 RemovePreTargetHandler(system_gesture_filter_.get()); | 664 RemovePreTargetHandler(system_gesture_filter_.get()); |
665 RemovePreTargetHandler(keyboard_metrics_filter_.get()); | 665 RemovePreTargetHandler(keyboard_metrics_filter_.get()); |
666 if (mouse_cursor_filter_) | 666 RemovePreTargetHandler(mouse_cursor_filter_.get()); |
667 RemovePreTargetHandler(mouse_cursor_filter_.get()); | |
668 | 667 |
669 // TooltipController is deleted with the Shell so removing its references. | 668 // TooltipController is deleted with the Shell so removing its references. |
670 RemovePreTargetHandler(tooltip_controller_.get()); | 669 RemovePreTargetHandler(tooltip_controller_.get()); |
671 | 670 |
672 // Destroy maximize window manager early on since it has some observers which | 671 // Destroy maximize window manager early on since it has some observers which |
673 // need to be removed. | 672 // need to be removed. |
674 maximize_mode_controller_.reset(); | 673 maximize_mode_controller_.reset(); |
675 maximize_mode_window_manager_.reset(); | 674 maximize_mode_window_manager_.reset(); |
676 | 675 |
677 // AppList needs to be released before shelf layout manager, which is | 676 // AppList needs to be released before shelf layout manager, which is |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
748 shelf_item_delegate_manager_.reset(); | 747 shelf_item_delegate_manager_.reset(); |
749 shelf_model_.reset(); | 748 shelf_model_.reset(); |
750 | 749 |
751 power_button_controller_.reset(); | 750 power_button_controller_.reset(); |
752 lock_state_controller_.reset(); | 751 lock_state_controller_.reset(); |
753 | 752 |
754 #if defined(OS_CHROMEOS) | 753 #if defined(OS_CHROMEOS) |
755 resolution_notification_controller_.reset(); | 754 resolution_notification_controller_.reset(); |
756 #endif | 755 #endif |
757 desktop_background_controller_.reset(); | 756 desktop_background_controller_.reset(); |
| 757 mouse_cursor_filter_.reset(); |
758 | 758 |
759 // This also deletes all RootWindows. Note that we invoke Shutdown() on | 759 // This also deletes all RootWindows. Note that we invoke Shutdown() on |
760 // DisplayController before resetting |display_controller_|, since destruction | 760 // DisplayController before resetting |display_controller_|, since destruction |
761 // of its owned RootWindowControllers relies on the value. | 761 // of its owned RootWindowControllers relies on the value. |
762 display_manager_->CreateScreenForShutdown(); | 762 display_manager_->CreateScreenForShutdown(); |
763 display_controller_->Shutdown(); | 763 display_controller_->Shutdown(); |
764 display_controller_.reset(); | 764 display_controller_.reset(); |
765 screen_position_controller_.reset(); | 765 screen_position_controller_.reset(); |
766 accessibility_delegate_.reset(); | 766 accessibility_delegate_.reset(); |
767 new_window_delegate_.reset(); | 767 new_window_delegate_.reset(); |
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1116 //////////////////////////////////////////////////////////////////////////////// | 1116 //////////////////////////////////////////////////////////////////////////////// |
1117 // Shell, aura::client::ActivationChangeObserver implementation: | 1117 // Shell, aura::client::ActivationChangeObserver implementation: |
1118 | 1118 |
1119 void Shell::OnWindowActivated(aura::Window* gained_active, | 1119 void Shell::OnWindowActivated(aura::Window* gained_active, |
1120 aura::Window* lost_active) { | 1120 aura::Window* lost_active) { |
1121 if (gained_active) | 1121 if (gained_active) |
1122 target_root_window_ = gained_active->GetRootWindow(); | 1122 target_root_window_ = gained_active->GetRootWindow(); |
1123 } | 1123 } |
1124 | 1124 |
1125 } // namespace ash | 1125 } // namespace ash |
OLD | NEW |