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

Side by Side Diff: trunk/src/ash/shell.h

Issue 167273003: Revert 251382 "event-rewrite: Clean up how events are rewritten." (Closed) Base URL: svn://svn.chromium.org/chrome/
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
« no previous file with comments | « trunk/src/ash/event_rewriter_delegate.h ('k') | trunk/src/ash/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 } 321 }
322 views::corewm::InputMethodEventFilter* input_method_filter() { 322 views::corewm::InputMethodEventFilter* input_method_filter() {
323 return input_method_filter_.get(); 323 return input_method_filter_.get();
324 } 324 }
325 views::corewm::CompoundEventFilter* env_filter() { 325 views::corewm::CompoundEventFilter* env_filter() {
326 return env_filter_.get(); 326 return env_filter_.get();
327 } 327 }
328 views::corewm::TooltipController* tooltip_controller() { 328 views::corewm::TooltipController* tooltip_controller() {
329 return tooltip_controller_.get(); 329 return tooltip_controller_.get();
330 } 330 }
331 internal::EventRewriterEventFilter* event_rewriter_filter() {
332 return event_rewriter_filter_.get();
333 }
331 internal::OverlayEventFilter* overlay_filter() { 334 internal::OverlayEventFilter* overlay_filter() {
332 return overlay_filter_.get(); 335 return overlay_filter_.get();
333 } 336 }
334 DesktopBackgroundController* desktop_background_controller() { 337 DesktopBackgroundController* desktop_background_controller() {
335 return desktop_background_controller_.get(); 338 return desktop_background_controller_.get();
336 } 339 }
337 PowerButtonController* power_button_controller() { 340 PowerButtonController* power_button_controller() {
338 return power_button_controller_.get(); 341 return power_button_controller_.get();
339 } 342 }
340 LockStateController* lock_state_controller() { 343 LockStateController* lock_state_controller() {
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 scoped_ptr<aura::client::UserActionClient> user_action_client_; 652 scoped_ptr<aura::client::UserActionClient> user_action_client_;
650 aura::client::ActivationClient* activation_client_; 653 aura::client::ActivationClient* activation_client_;
651 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; 654 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
652 scoped_ptr<internal::ScreenPositionController> screen_position_controller_; 655 scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
653 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_; 656 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_;
654 scoped_ptr<internal::EventClientImpl> event_client_; 657 scoped_ptr<internal::EventClientImpl> event_client_;
655 scoped_ptr<internal::EventTransformationHandler> 658 scoped_ptr<internal::EventTransformationHandler>
656 event_transformation_handler_; 659 event_transformation_handler_;
657 scoped_ptr<WindowTreeHostFactory> window_tree_host_factory_; 660 scoped_ptr<WindowTreeHostFactory> window_tree_host_factory_;
658 661
662 // An event filter that rewrites or drops an event.
663 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_;
664
659 // An event filter that pre-handles key events while the partial 665 // An event filter that pre-handles key events while the partial
660 // screenshot UI or the keyboard overlay is active. 666 // screenshot UI or the keyboard overlay is active.
661 scoped_ptr<internal::OverlayEventFilter> overlay_filter_; 667 scoped_ptr<internal::OverlayEventFilter> overlay_filter_;
662 668
663 // An event filter for logging keyboard-related metrics. 669 // An event filter for logging keyboard-related metrics.
664 scoped_ptr<internal::KeyboardUMAEventFilter> keyboard_metrics_filter_; 670 scoped_ptr<internal::KeyboardUMAEventFilter> keyboard_metrics_filter_;
665 671
666 // An event filter which handles moving and resizing windows. 672 // An event filter which handles moving and resizing windows.
667 scoped_ptr<ToplevelWindowEventHandler> toplevel_window_event_handler_; 673 scoped_ptr<ToplevelWindowEventHandler> toplevel_window_event_handler_;
668 674
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 724
719 // Injected content::GPUDataManager support. 725 // Injected content::GPUDataManager support.
720 scoped_ptr<GPUSupport> gpu_support_; 726 scoped_ptr<GPUSupport> gpu_support_;
721 727
722 DISALLOW_COPY_AND_ASSIGN(Shell); 728 DISALLOW_COPY_AND_ASSIGN(Shell);
723 }; 729 };
724 730
725 } // namespace ash 731 } // namespace ash
726 732
727 #endif // ASH_SHELL_H_ 733 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « trunk/src/ash/event_rewriter_delegate.h ('k') | trunk/src/ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698