OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_ | 5 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_ |
6 #define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_ | 6 #define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 } | 46 } |
47 | 47 |
48 namespace wm { | 48 namespace wm { |
49 class CompoundEventFilter; | 49 class CompoundEventFilter; |
50 class CursorManager; | 50 class CursorManager; |
51 } | 51 } |
52 | 52 |
53 namespace extensions { | 53 namespace extensions { |
54 class AppWindowClient; | 54 class AppWindowClient; |
55 class Extension; | 55 class Extension; |
| 56 class InputMethodEventHandler; |
56 class ShellScreen; | 57 class ShellScreen; |
57 | 58 |
58 // Simple desktop controller for app_shell. Sets up a root Aura window for the | 59 // Simple desktop controller for app_shell. Sets up a root Aura window for the |
59 // primary display. | 60 // primary display. |
60 class ShellDesktopControllerAura | 61 class ShellDesktopControllerAura |
61 : public DesktopController, | 62 : public DesktopController, |
62 public aura::client::WindowParentingClient, | 63 public aura::client::WindowParentingClient, |
63 #if defined(OS_CHROMEOS) | 64 #if defined(OS_CHROMEOS) |
64 public chromeos::PowerManagerClient::Observer, | 65 public chromeos::PowerManagerClient::Observer, |
65 public display::DisplayConfigurator::Observer, | 66 public display::DisplayConfigurator::Observer, |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 #if defined(OS_CHROMEOS) | 121 #if defined(OS_CHROMEOS) |
121 std::unique_ptr<display::DisplayConfigurator> display_configurator_; | 122 std::unique_ptr<display::DisplayConfigurator> display_configurator_; |
122 #endif | 123 #endif |
123 | 124 |
124 std::unique_ptr<ShellScreen> screen_; | 125 std::unique_ptr<ShellScreen> screen_; |
125 | 126 |
126 std::unique_ptr<aura::WindowTreeHost> host_; | 127 std::unique_ptr<aura::WindowTreeHost> host_; |
127 | 128 |
128 std::unique_ptr<wm::CompoundEventFilter> root_window_event_filter_; | 129 std::unique_ptr<wm::CompoundEventFilter> root_window_event_filter_; |
129 | 130 |
| 131 std::unique_ptr<InputMethodEventHandler> input_method_event_handler_; |
| 132 |
130 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; | 133 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; |
131 | 134 |
132 std::unique_ptr<aura::client::FocusClient> focus_client_; | 135 std::unique_ptr<aura::client::FocusClient> focus_client_; |
133 | 136 |
134 std::unique_ptr<wm::CursorManager> cursor_manager_; | 137 std::unique_ptr<wm::CursorManager> cursor_manager_; |
135 | 138 |
136 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; | 139 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; |
137 #if defined(OS_CHROMEOS) | 140 #if defined(OS_CHROMEOS) |
138 std::unique_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; | 141 std::unique_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; |
139 #endif | 142 #endif |
140 | 143 |
141 std::unique_ptr<AppWindowClient> app_window_client_; | 144 std::unique_ptr<AppWindowClient> app_window_client_; |
142 | 145 |
143 // NativeAppWindow::Close() deletes the AppWindow. | 146 // NativeAppWindow::Close() deletes the AppWindow. |
144 std::vector<AppWindow*> app_windows_; | 147 std::vector<AppWindow*> app_windows_; |
145 | 148 |
146 DISALLOW_COPY_AND_ASSIGN(ShellDesktopControllerAura); | 149 DISALLOW_COPY_AND_ASSIGN(ShellDesktopControllerAura); |
147 }; | 150 }; |
148 | 151 |
149 } // namespace extensions | 152 } // namespace extensions |
150 | 153 |
151 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_ | 154 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_ |
OLD | NEW |