| 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 "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 #endif | 42 #endif |
| 43 | 43 |
| 44 namespace wm { | 44 namespace wm { |
| 45 class CompoundEventFilter; | 45 class CompoundEventFilter; |
| 46 class CursorManager; | 46 class CursorManager; |
| 47 class InputMethodEventFilter; | 47 class InputMethodEventFilter; |
| 48 class UserActivityDetector; | 48 class UserActivityDetector; |
| 49 } | 49 } |
| 50 | 50 |
| 51 namespace extensions { | 51 namespace extensions { |
| 52 class AppsClient; | 52 class AppWindowClient; |
| 53 class Extension; | 53 class Extension; |
| 54 | 54 |
| 55 // Handles desktop-related tasks for app_shell. | 55 // Handles desktop-related tasks for app_shell. |
| 56 class ShellDesktopController : public DesktopController, | 56 class ShellDesktopController : public DesktopController, |
| 57 public aura::client::WindowTreeClient, | 57 public aura::client::WindowTreeClient, |
| 58 #if defined(OS_CHROMEOS) | 58 #if defined(OS_CHROMEOS) |
| 59 public chromeos::PowerManagerClient::Observer, | 59 public chromeos::PowerManagerClient::Observer, |
| 60 public ui::DisplayConfigurator::Observer, | 60 public ui::DisplayConfigurator::Observer, |
| 61 #endif | 61 #endif |
| 62 public aura::WindowTreeHostObserver { | 62 public aura::WindowTreeHostObserver { |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 | 122 |
| 123 scoped_ptr<aura::client::FocusClient> focus_client_; | 123 scoped_ptr<aura::client::FocusClient> focus_client_; |
| 124 | 124 |
| 125 scoped_ptr<wm::CursorManager> cursor_manager_; | 125 scoped_ptr<wm::CursorManager> cursor_manager_; |
| 126 | 126 |
| 127 scoped_ptr<wm::UserActivityDetector> user_activity_detector_; | 127 scoped_ptr<wm::UserActivityDetector> user_activity_detector_; |
| 128 #if defined(OS_CHROMEOS) | 128 #if defined(OS_CHROMEOS) |
| 129 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; | 129 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; |
| 130 #endif | 130 #endif |
| 131 | 131 |
| 132 scoped_ptr<AppsClient> apps_client_; | 132 scoped_ptr<AppWindowClient> apps_client_; |
| 133 | 133 |
| 134 // The desktop supports a single app window. | 134 // The desktop supports a single app window. |
| 135 AppWindow* app_window_; // NativeAppWindow::Close() deletes this. | 135 AppWindow* app_window_; // NativeAppWindow::Close() deletes this. |
| 136 | 136 |
| 137 DISALLOW_COPY_AND_ASSIGN(ShellDesktopController); | 137 DISALLOW_COPY_AND_ASSIGN(ShellDesktopController); |
| 138 }; | 138 }; |
| 139 | 139 |
| 140 } // namespace extensions | 140 } // namespace extensions |
| 141 | 141 |
| 142 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ | 142 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ |
| OLD | NEW |