| 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 <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 namespace ui { | 39 namespace ui { |
| 40 class UserActivityDetector; | 40 class UserActivityDetector; |
| 41 #if defined(OS_CHROMEOS) | 41 #if defined(OS_CHROMEOS) |
| 42 class UserActivityPowerManagerNotifier; | 42 class UserActivityPowerManagerNotifier; |
| 43 #endif | 43 #endif |
| 44 } | 44 } |
| 45 | 45 |
| 46 namespace wm { | 46 namespace wm { |
| 47 class CompoundEventFilter; | 47 class CompoundEventFilter; |
| 48 class CursorManager; | 48 class CursorManager; |
| 49 class InputMethodEventFilter; | |
| 50 } | 49 } |
| 51 | 50 |
| 52 namespace extensions { | 51 namespace extensions { |
| 53 class AppWindowClient; | 52 class AppWindowClient; |
| 54 class Extension; | 53 class Extension; |
| 55 class ShellScreen; | 54 class ShellScreen; |
| 56 | 55 |
| 57 // Handles desktop-related tasks for app_shell. | 56 // Handles desktop-related tasks for app_shell. |
| 58 class ShellDesktopControllerAura | 57 class ShellDesktopControllerAura |
| 59 : public DesktopController, | 58 : public DesktopController, |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 #endif | 113 #endif |
| 115 | 114 |
| 116 scoped_ptr<ShellScreen> screen_; | 115 scoped_ptr<ShellScreen> screen_; |
| 117 | 116 |
| 118 scoped_ptr<aura::WindowTreeHost> host_; | 117 scoped_ptr<aura::WindowTreeHost> host_; |
| 119 | 118 |
| 120 scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_; | 119 scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_; |
| 121 | 120 |
| 122 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; | 121 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; |
| 123 | 122 |
| 124 scoped_ptr<wm::InputMethodEventFilter> input_method_filter_; | |
| 125 | |
| 126 scoped_ptr<aura::client::FocusClient> focus_client_; | 123 scoped_ptr<aura::client::FocusClient> focus_client_; |
| 127 | 124 |
| 128 scoped_ptr<wm::CursorManager> cursor_manager_; | 125 scoped_ptr<wm::CursorManager> cursor_manager_; |
| 129 | 126 |
| 130 scoped_ptr<ui::UserActivityDetector> user_activity_detector_; | 127 scoped_ptr<ui::UserActivityDetector> user_activity_detector_; |
| 131 #if defined(OS_CHROMEOS) | 128 #if defined(OS_CHROMEOS) |
| 132 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; | 129 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; |
| 133 #endif | 130 #endif |
| 134 | 131 |
| 135 scoped_ptr<AppWindowClient> app_window_client_; | 132 scoped_ptr<AppWindowClient> app_window_client_; |
| 136 | 133 |
| 137 // NativeAppWindow::Close() deletes the AppWindow. | 134 // NativeAppWindow::Close() deletes the AppWindow. |
| 138 std::vector<AppWindow*> app_windows_; | 135 std::vector<AppWindow*> app_windows_; |
| 139 | 136 |
| 140 DISALLOW_COPY_AND_ASSIGN(ShellDesktopControllerAura); | 137 DISALLOW_COPY_AND_ASSIGN(ShellDesktopControllerAura); |
| 141 }; | 138 }; |
| 142 | 139 |
| 143 } // namespace extensions | 140 } // namespace extensions |
| 144 | 141 |
| 145 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_ | 142 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_ |
| OLD | NEW |