OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 UI_AURA_SHELL_SHELL_H_ | 5 #ifndef UI_AURA_SHELL_SHELL_H_ |
6 #define UI_AURA_SHELL_SHELL_H_ | 6 #define UI_AURA_SHELL_SHELL_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 17 matching lines...) Expand all Loading... |
28 | 28 |
29 class Launcher; | 29 class Launcher; |
30 class ShellAcceleratorController; | 30 class ShellAcceleratorController; |
31 class ShellDelegate; | 31 class ShellDelegate; |
32 class ShellTooltipManager; | 32 class ShellTooltipManager; |
33 | 33 |
34 namespace internal { | 34 namespace internal { |
35 class ActivationController; | 35 class ActivationController; |
36 class AppList; | 36 class AppList; |
37 class DragDropController; | 37 class DragDropController; |
| 38 class InputMethodEventFilter; |
38 class ShadowController; | 39 class ShadowController; |
39 class ShellAcceleratorFilter; | 40 class ShellAcceleratorFilter; |
40 class WorkspaceController; | 41 class WorkspaceController; |
41 } | 42 } |
42 | 43 |
43 // Shell is a singleton object that presents the Shell API and implements the | 44 // Shell is a singleton object that presents the Shell API and implements the |
44 // RootWindow's delegate interface. | 45 // RootWindow's delegate interface. |
45 class AURA_SHELL_EXPORT Shell { | 46 class AURA_SHELL_EXPORT Shell { |
46 public: | 47 public: |
47 // Upon creation, the Shell sets itself as the RootWindow's delegate, which | 48 // Upon creation, the Shell sets itself as the RootWindow's delegate, which |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 | 112 |
112 scoped_ptr<Launcher> launcher_; | 113 scoped_ptr<Launcher> launcher_; |
113 | 114 |
114 scoped_ptr<internal::AppList> app_list_; | 115 scoped_ptr<internal::AppList> app_list_; |
115 | 116 |
116 scoped_ptr<internal::ActivationController> activation_controller_; | 117 scoped_ptr<internal::ActivationController> activation_controller_; |
117 scoped_ptr<internal::DragDropController> drag_drop_controller_; | 118 scoped_ptr<internal::DragDropController> drag_drop_controller_; |
118 scoped_ptr<internal::WorkspaceController> workspace_controller_; | 119 scoped_ptr<internal::WorkspaceController> workspace_controller_; |
119 scoped_ptr<internal::ShadowController> shadow_controller_; | 120 scoped_ptr<internal::ShadowController> shadow_controller_; |
120 | 121 |
| 122 // An event filter that pre-handles all key events to send them to an IME. |
| 123 scoped_ptr<internal::InputMethodEventFilter> input_method_filter_; |
121 // An event filter that pre-handles global accelerators. | 124 // An event filter that pre-handles global accelerators. |
122 scoped_ptr<internal::ShellAcceleratorFilter> accelerator_filter_; | 125 scoped_ptr<internal::ShellAcceleratorFilter> accelerator_filter_; |
123 | 126 |
124 scoped_ptr<ShellTooltipManager> tooltip_manager_; | 127 scoped_ptr<ShellTooltipManager> tooltip_manager_; |
125 | 128 |
126 DISALLOW_COPY_AND_ASSIGN(Shell); | 129 DISALLOW_COPY_AND_ASSIGN(Shell); |
127 }; | 130 }; |
128 | 131 |
129 } // namespace aura_shell | 132 } // namespace aura_shell |
130 | 133 |
131 #endif // UI_AURA_SHELL_SHELL_H_ | 134 #endif // UI_AURA_SHELL_SHELL_H_ |
OLD | NEW |