Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1142)

Side by Side Diff: ash/shell.cc

Issue 165463002: event-rewrite: Clean up how events are rewritten. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "ash/system/locale/locale_notification_controller.h" 51 #include "ash/system/locale/locale_notification_controller.h"
52 #include "ash/system/status_area_widget.h" 52 #include "ash/system/status_area_widget.h"
53 #include "ash/system/tray/system_tray_delegate.h" 53 #include "ash/system/tray/system_tray_delegate.h"
54 #include "ash/system/tray/system_tray_notifier.h" 54 #include "ash/system/tray/system_tray_notifier.h"
55 #include "ash/wm/app_list_controller.h" 55 #include "ash/wm/app_list_controller.h"
56 #include "ash/wm/ash_focus_rules.h" 56 #include "ash/wm/ash_focus_rules.h"
57 #include "ash/wm/ash_native_cursor_manager.h" 57 #include "ash/wm/ash_native_cursor_manager.h"
58 #include "ash/wm/coordinate_conversion.h" 58 #include "ash/wm/coordinate_conversion.h"
59 #include "ash/wm/custom_frame_view_ash.h" 59 #include "ash/wm/custom_frame_view_ash.h"
60 #include "ash/wm/event_client_impl.h" 60 #include "ash/wm/event_client_impl.h"
61 #include "ash/wm/event_rewriter_event_filter.h"
62 #include "ash/wm/lock_state_controller.h" 61 #include "ash/wm/lock_state_controller.h"
63 #include "ash/wm/mru_window_tracker.h" 62 #include "ash/wm/mru_window_tracker.h"
64 #include "ash/wm/overlay_event_filter.h" 63 #include "ash/wm/overlay_event_filter.h"
65 #include "ash/wm/overview/window_selector_controller.h" 64 #include "ash/wm/overview/window_selector_controller.h"
66 #include "ash/wm/power_button_controller.h" 65 #include "ash/wm/power_button_controller.h"
67 #include "ash/wm/resize_shadow_controller.h" 66 #include "ash/wm/resize_shadow_controller.h"
68 #include "ash/wm/root_window_layout_manager.h" 67 #include "ash/wm/root_window_layout_manager.h"
69 #include "ash/wm/screen_dimmer.h" 68 #include "ash/wm/screen_dimmer.h"
70 #include "ash/wm/system_gesture_event_filter.h" 69 #include "ash/wm/system_gesture_event_filter.h"
71 #include "ash/wm/system_modal_container_event_filter.h" 70 #include "ash/wm/system_modal_container_event_filter.h"
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 // See bug crbug.com/134502. 615 // See bug crbug.com/134502.
617 aura::client::GetFocusClient(GetPrimaryRootWindow())->FocusWindow(NULL); 616 aura::client::GetFocusClient(GetPrimaryRootWindow())->FocusWindow(NULL);
618 617
619 // Please keep in same order as in Init() because it's easy to miss one. 618 // Please keep in same order as in Init() because it's easy to miss one.
620 if (window_modality_controller_) 619 if (window_modality_controller_)
621 window_modality_controller_.reset(); 620 window_modality_controller_.reset();
622 #if defined(OS_CHROMEOS) && defined(USE_X11) 621 #if defined(OS_CHROMEOS) && defined(USE_X11)
623 RemovePreTargetHandler(magnifier_key_scroller_.get()); 622 RemovePreTargetHandler(magnifier_key_scroller_.get());
624 magnifier_key_scroller_.reset(); 623 magnifier_key_scroller_.reset();
625 #endif 624 #endif
626 RemovePreTargetHandler(event_rewriter_filter_.get());
627 RemovePreTargetHandler(user_activity_detector_.get()); 625 RemovePreTargetHandler(user_activity_detector_.get());
628 RemovePreTargetHandler(overlay_filter_.get()); 626 RemovePreTargetHandler(overlay_filter_.get());
629 RemovePreTargetHandler(input_method_filter_.get()); 627 RemovePreTargetHandler(input_method_filter_.get());
630 RemovePreTargetHandler(accelerator_filter_.get()); 628 RemovePreTargetHandler(accelerator_filter_.get());
631 RemovePreTargetHandler(event_transformation_handler_.get()); 629 RemovePreTargetHandler(event_transformation_handler_.get());
632 RemovePreTargetHandler(toplevel_window_event_handler_.get()); 630 RemovePreTargetHandler(toplevel_window_event_handler_.get());
633 RemovePostTargetHandler(toplevel_window_event_handler_.get()); 631 RemovePostTargetHandler(toplevel_window_event_handler_.get());
634 RemovePreTargetHandler(system_gesture_filter_.get()); 632 RemovePreTargetHandler(system_gesture_filter_.get());
635 RemovePreTargetHandler(keyboard_metrics_filter_.get()); 633 RemovePreTargetHandler(keyboard_metrics_filter_.get());
636 if (mouse_cursor_filter_) 634 if (mouse_cursor_filter_)
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 825
828 nested_dispatcher_controller_.reset(new NestedDispatcherController); 826 nested_dispatcher_controller_.reset(new NestedDispatcherController);
829 accelerator_controller_.reset(new AcceleratorController); 827 accelerator_controller_.reset(new AcceleratorController);
830 828
831 #if defined(OS_CHROMEOS) && defined(USE_X11) 829 #if defined(OS_CHROMEOS) && defined(USE_X11)
832 magnifier_key_scroller_.reset(new MagnifierKeyScroller); 830 magnifier_key_scroller_.reset(new MagnifierKeyScroller);
833 AddPreTargetHandler(magnifier_key_scroller_.get()); 831 AddPreTargetHandler(magnifier_key_scroller_.get());
834 #endif 832 #endif
835 833
836 // The order in which event filters are added is significant. 834 // The order in which event filters are added is significant.
837 event_rewriter_filter_.reset(new internal::EventRewriterEventFilter);
838 AddPreTargetHandler(event_rewriter_filter_.get());
839 835
840 #if defined(OS_CHROMEOS) 836 #if defined(OS_CHROMEOS)
841 // The StickyKeysController also rewrites events and must be added 837 // The StickyKeysController also rewrites events and must be added
842 // before observers, but after the EventRewriterEventFilter. 838 // before observers, but after the EventRewriterEventFilter.
843 sticky_keys_controller_.reset(new StickyKeysController); 839 sticky_keys_controller_.reset(new StickyKeysController);
844 AddPreTargetHandler(sticky_keys_controller_.get()); 840 AddPreTargetHandler(sticky_keys_controller_.get());
845 #endif 841 #endif
846 842
847 // UserActivityDetector passes events to observers, so let them get 843 // UserActivityDetector passes events to observers, so let them get
848 // rewritten first. 844 // rewritten first.
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
1076 //////////////////////////////////////////////////////////////////////////////// 1072 ////////////////////////////////////////////////////////////////////////////////
1077 // Shell, aura::client::ActivationChangeObserver implementation: 1073 // Shell, aura::client::ActivationChangeObserver implementation:
1078 1074
1079 void Shell::OnWindowActivated(aura::Window* gained_active, 1075 void Shell::OnWindowActivated(aura::Window* gained_active,
1080 aura::Window* lost_active) { 1076 aura::Window* lost_active) {
1081 if (gained_active) 1077 if (gained_active)
1082 target_root_window_ = gained_active->GetRootWindow(); 1078 target_root_window_ = gained_active->GetRootWindow();
1083 } 1079 }
1084 1080
1085 } // namespace ash 1081 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698