| 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_H_ | 5 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ |
| 6 #define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ | 6 #define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 #if defined(OS_CHROMEOS) | 40 #if defined(OS_CHROMEOS) |
| 41 namespace ui { | 41 namespace ui { |
| 42 class UserActivityPowerManagerNotifier; | 42 class UserActivityPowerManagerNotifier; |
| 43 } | 43 } |
| 44 #endif | 44 #endif |
| 45 | 45 |
| 46 namespace wm { | 46 namespace wm { |
| 47 class CompoundEventFilter; | 47 class CompoundEventFilter; |
| 48 class CursorManager; | 48 class CursorManager; |
| 49 class InputMethodEventFilter; | 49 class InputMethodEventFilter; |
| 50 class UserActivityDetector; | |
| 51 } | 50 } |
| 52 | 51 |
| 53 namespace extensions { | 52 namespace extensions { |
| 54 class AppWindowClient; | 53 class AppWindowClient; |
| 55 class Extension; | 54 class Extension; |
| 56 | 55 |
| 57 // Handles desktop-related tasks for app_shell. | 56 // Handles desktop-related tasks for app_shell. |
| 58 class ShellDesktopController : public DesktopController, | 57 class ShellDesktopController : public DesktopController, |
| 59 public aura::client::WindowTreeClient, | 58 public aura::client::WindowTreeClient, |
| 60 #if defined(OS_CHROMEOS) | 59 #if defined(OS_CHROMEOS) |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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_; | 123 scoped_ptr<wm::InputMethodEventFilter> input_method_filter_; |
| 125 | 124 |
| 126 scoped_ptr<aura::client::FocusClient> focus_client_; | 125 scoped_ptr<aura::client::FocusClient> focus_client_; |
| 127 | 126 |
| 128 scoped_ptr<wm::CursorManager> cursor_manager_; | 127 scoped_ptr<wm::CursorManager> cursor_manager_; |
| 129 | 128 |
| 130 scoped_ptr<wm::UserActivityDetector> user_activity_detector_; | |
| 131 #if defined(OS_CHROMEOS) | 129 #if defined(OS_CHROMEOS) |
| 132 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; | 130 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; |
| 133 #endif | 131 #endif |
| 134 | 132 |
| 135 scoped_ptr<AppWindowClient> app_window_client_; | 133 scoped_ptr<AppWindowClient> app_window_client_; |
| 136 | 134 |
| 137 // NativeAppWindow::Close() deletes the AppWindow. | 135 // NativeAppWindow::Close() deletes the AppWindow. |
| 138 std::vector<AppWindow*> app_windows_; | 136 std::vector<AppWindow*> app_windows_; |
| 139 | 137 |
| 140 DISALLOW_COPY_AND_ASSIGN(ShellDesktopController); | 138 DISALLOW_COPY_AND_ASSIGN(ShellDesktopController); |
| 141 }; | 139 }; |
| 142 | 140 |
| 143 } // namespace extensions | 141 } // namespace extensions |
| 144 | 142 |
| 145 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ | 143 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ |
| OLD | NEW |