| 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 APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ | 5 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ |
| 6 #define APPS_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" |
| 11 #include "ui/aura/client/window_tree_client.h" | 11 #include "ui/aura/client/window_tree_client.h" |
| 12 #include "ui/aura/window_tree_host_observer.h" | 12 #include "ui/aura/window_tree_host_observer.h" |
| 13 | 13 |
| 14 #if defined(OS_CHROMEOS) | 14 #if defined(OS_CHROMEOS) |
| 15 #include "ui/display/chromeos/display_configurator.h" | 15 #include "ui/display/chromeos/display_configurator.h" |
| 16 #endif | 16 #endif |
| (...skipping 23 matching lines...) Expand all Loading... |
| 40 #endif | 40 #endif |
| 41 | 41 |
| 42 namespace wm { | 42 namespace wm { |
| 43 class CompoundEventFilter; | 43 class CompoundEventFilter; |
| 44 class CursorManager; | 44 class CursorManager; |
| 45 class FocusRules; | 45 class FocusRules; |
| 46 class InputMethodEventFilter; | 46 class InputMethodEventFilter; |
| 47 class UserActivityDetector; | 47 class UserActivityDetector; |
| 48 } | 48 } |
| 49 | 49 |
| 50 namespace apps { | 50 namespace extensions { |
| 51 | 51 |
| 52 class ShellAppWindow; | 52 class ShellAppWindow; |
| 53 class ShellAppWindowController; | 53 class ShellAppWindowController; |
| 54 | 54 |
| 55 // Handles desktop-related tasks for app_shell. | 55 // Handles desktop-related tasks for app_shell. |
| 56 class ShellDesktopController : public aura::client::WindowTreeClient, | 56 class ShellDesktopController : public aura::client::WindowTreeClient, |
| 57 public aura::WindowTreeHostObserver | 57 public aura::WindowTreeHostObserver |
| 58 #if defined(OS_CHROMEOS) | 58 #if defined(OS_CHROMEOS) |
| 59 , | 59 , |
| 60 public ui::DisplayConfigurator::Observer | 60 public ui::DisplayConfigurator::Observer |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 #if defined(OS_CHROMEOS) | 137 #if defined(OS_CHROMEOS) |
| 138 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; | 138 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; |
| 139 #endif | 139 #endif |
| 140 | 140 |
| 141 // The desktop supports a single app window. | 141 // The desktop supports a single app window. |
| 142 scoped_ptr<ShellAppWindowController> app_window_controller_; | 142 scoped_ptr<ShellAppWindowController> app_window_controller_; |
| 143 | 143 |
| 144 DISALLOW_COPY_AND_ASSIGN(ShellDesktopController); | 144 DISALLOW_COPY_AND_ASSIGN(ShellDesktopController); |
| 145 }; | 145 }; |
| 146 | 146 |
| 147 } // namespace apps | 147 } // namespace extensions |
| 148 | 148 |
| 149 #endif // APPS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ | 149 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_H_ |
| OLD | NEW |