| 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 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 #include "ash/display/event_transformation_handler.h" | 45 #include "ash/display/event_transformation_handler.h" |
| 46 #include "ash/display/mouse_cursor_event_filter.h" | 46 #include "ash/display/mouse_cursor_event_filter.h" |
| 47 #include "ash/display/screen_position_controller.h" | 47 #include "ash/display/screen_position_controller.h" |
| 48 #include "ash/display/window_tree_host_manager.h" | 48 #include "ash/display/window_tree_host_manager.h" |
| 49 #include "ash/drag_drop/drag_drop_controller.h" | 49 #include "ash/drag_drop/drag_drop_controller.h" |
| 50 #include "ash/first_run/first_run_helper_impl.h" | 50 #include "ash/first_run/first_run_helper_impl.h" |
| 51 #include "ash/frame/custom_frame_view_ash.h" | 51 #include "ash/frame/custom_frame_view_ash.h" |
| 52 #include "ash/high_contrast/high_contrast_controller.h" | 52 #include "ash/high_contrast/high_contrast_controller.h" |
| 53 #include "ash/host/ash_window_tree_host_init_params.h" | 53 #include "ash/host/ash_window_tree_host_init_params.h" |
| 54 #include "ash/ime/input_method_event_handler.h" | 54 #include "ash/ime/input_method_event_handler.h" |
| 55 #include "ash/keyboard_uma_event_filter.h" | |
| 56 #include "ash/magnifier/magnification_controller.h" | 55 #include "ash/magnifier/magnification_controller.h" |
| 57 #include "ash/magnifier/partial_magnification_controller.h" | 56 #include "ash/magnifier/partial_magnification_controller.h" |
| 58 #include "ash/new_window_delegate.h" | 57 #include "ash/new_window_delegate.h" |
| 59 #include "ash/root_window_controller.h" | 58 #include "ash/root_window_controller.h" |
| 60 #include "ash/shelf/shelf.h" | 59 #include "ash/shelf/shelf.h" |
| 61 #include "ash/shelf/shelf_widget.h" | 60 #include "ash/shelf/shelf_widget.h" |
| 62 #include "ash/shelf/shelf_window_watcher.h" | 61 #include "ash/shelf/shelf_window_watcher.h" |
| 63 #include "ash/shell_factory.h" | 62 #include "ash/shell_factory.h" |
| 64 #include "ash/shell_init_params.h" | 63 #include "ash/shell_init_params.h" |
| 65 #include "ash/utility/screenshot_controller.h" | 64 #include "ash/utility/screenshot_controller.h" |
| (...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 594 | 593 |
| 595 RemovePreTargetHandler(speech_feedback_handler_.get()); | 594 RemovePreTargetHandler(speech_feedback_handler_.get()); |
| 596 speech_feedback_handler_.reset(); | 595 speech_feedback_handler_.reset(); |
| 597 #endif | 596 #endif |
| 598 RemovePreTargetHandler(overlay_filter_.get()); | 597 RemovePreTargetHandler(overlay_filter_.get()); |
| 599 RemovePreTargetHandler(accelerator_filter_.get()); | 598 RemovePreTargetHandler(accelerator_filter_.get()); |
| 600 RemovePreTargetHandler(event_transformation_handler_.get()); | 599 RemovePreTargetHandler(event_transformation_handler_.get()); |
| 601 RemovePreTargetHandler(toplevel_window_event_handler_.get()); | 600 RemovePreTargetHandler(toplevel_window_event_handler_.get()); |
| 602 RemovePostTargetHandler(toplevel_window_event_handler_.get()); | 601 RemovePostTargetHandler(toplevel_window_event_handler_.get()); |
| 603 RemovePreTargetHandler(system_gesture_filter_.get()); | 602 RemovePreTargetHandler(system_gesture_filter_.get()); |
| 604 RemovePreTargetHandler(keyboard_metrics_filter_.get()); | |
| 605 RemovePreTargetHandler(mouse_cursor_filter_.get()); | 603 RemovePreTargetHandler(mouse_cursor_filter_.get()); |
| 606 RemovePreTargetHandler(modality_filter_.get()); | 604 RemovePreTargetHandler(modality_filter_.get()); |
| 607 | 605 |
| 608 // TooltipController is deleted with the Shell so removing its references. | 606 // TooltipController is deleted with the Shell so removing its references. |
| 609 RemovePreTargetHandler(tooltip_controller_.get()); | 607 RemovePreTargetHandler(tooltip_controller_.get()); |
| 610 | 608 |
| 611 #if defined(OS_CHROMEOS) | 609 #if defined(OS_CHROMEOS) |
| 612 screen_orientation_controller_.reset(); | 610 screen_orientation_controller_.reset(); |
| 613 #endif | 611 #endif |
| 614 | 612 |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 892 | 890 |
| 893 event_transformation_handler_.reset(new EventTransformationHandler); | 891 event_transformation_handler_.reset(new EventTransformationHandler); |
| 894 AddPreTargetHandler(event_transformation_handler_.get()); | 892 AddPreTargetHandler(event_transformation_handler_.get()); |
| 895 | 893 |
| 896 toplevel_window_event_handler_.reset( | 894 toplevel_window_event_handler_.reset( |
| 897 new ToplevelWindowEventHandler(wm_shell_.get())); | 895 new ToplevelWindowEventHandler(wm_shell_.get())); |
| 898 | 896 |
| 899 system_gesture_filter_.reset(new SystemGestureEventFilter); | 897 system_gesture_filter_.reset(new SystemGestureEventFilter); |
| 900 AddPreTargetHandler(system_gesture_filter_.get()); | 898 AddPreTargetHandler(system_gesture_filter_.get()); |
| 901 | 899 |
| 902 keyboard_metrics_filter_.reset(new KeyboardUMAEventFilter); | |
| 903 AddPreTargetHandler(keyboard_metrics_filter_.get()); | |
| 904 | |
| 905 #if defined(OS_CHROMEOS) | 900 #if defined(OS_CHROMEOS) |
| 906 sticky_keys_controller_.reset(new StickyKeysController); | 901 sticky_keys_controller_.reset(new StickyKeysController); |
| 907 #endif | 902 #endif |
| 908 screen_pinning_controller_.reset( | 903 screen_pinning_controller_.reset( |
| 909 new ScreenPinningController(window_tree_host_manager_.get())); | 904 new ScreenPinningController(window_tree_host_manager_.get())); |
| 910 | 905 |
| 911 lock_state_controller_.reset(new LockStateController); | 906 lock_state_controller_.reset(new LockStateController); |
| 912 power_button_controller_.reset( | 907 power_button_controller_.reset( |
| 913 new PowerButtonController(lock_state_controller_.get())); | 908 new PowerButtonController(lock_state_controller_.get())); |
| 914 #if defined(OS_CHROMEOS) | 909 #if defined(OS_CHROMEOS) |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1106 | 1101 |
| 1107 void Shell::OnWindowActivated( | 1102 void Shell::OnWindowActivated( |
| 1108 aura::client::ActivationChangeObserver::ActivationReason reason, | 1103 aura::client::ActivationChangeObserver::ActivationReason reason, |
| 1109 aura::Window* gained_active, | 1104 aura::Window* gained_active, |
| 1110 aura::Window* lost_active) { | 1105 aura::Window* lost_active) { |
| 1111 if (gained_active) | 1106 if (gained_active) |
| 1112 target_root_window_ = gained_active->GetRootWindow(); | 1107 target_root_window_ = gained_active->GetRootWindow(); |
| 1113 } | 1108 } |
| 1114 | 1109 |
| 1115 } // namespace ash | 1110 } // namespace ash |
| OLD | NEW |