| 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 <vector> | 9 #include <vector> |
| 9 | 10 |
| 10 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 11 #include "base/macros.h" | 12 #include "base/macros.h" |
| 12 #include "base/memory/scoped_ptr.h" | |
| 13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
| 14 #include "extensions/shell/browser/desktop_controller.h" | 14 #include "extensions/shell/browser/desktop_controller.h" |
| 15 #include "ui/aura/client/window_tree_client.h" | 15 #include "ui/aura/client/window_tree_client.h" |
| 16 #include "ui/aura/window_tree_host_observer.h" | 16 #include "ui/aura/window_tree_host_observer.h" |
| 17 | 17 |
| 18 #if defined(OS_CHROMEOS) | 18 #if defined(OS_CHROMEOS) |
| 19 #include "chromeos/dbus/power_manager_client.h" | 19 #include "chromeos/dbus/power_manager_client.h" |
| 20 #include "ui/display/chromeos/display_configurator.h" | 20 #include "ui/display/chromeos/display_configurator.h" |
| 21 #endif | 21 #endif |
| 22 | 22 |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 void CreateRootWindow(); | 103 void CreateRootWindow(); |
| 104 | 104 |
| 105 // Closes and destroys the root window hosting the app. | 105 // Closes and destroys the root window hosting the app. |
| 106 void DestroyRootWindow(); | 106 void DestroyRootWindow(); |
| 107 | 107 |
| 108 // Returns the dimensions (in pixels) of the primary display, or an empty size | 108 // Returns the dimensions (in pixels) of the primary display, or an empty size |
| 109 // if the dimensions can't be determined or no display is connected. | 109 // if the dimensions can't be determined or no display is connected. |
| 110 gfx::Size GetPrimaryDisplaySize(); | 110 gfx::Size GetPrimaryDisplaySize(); |
| 111 | 111 |
| 112 #if defined(OS_CHROMEOS) | 112 #if defined(OS_CHROMEOS) |
| 113 scoped_ptr<ui::DisplayConfigurator> display_configurator_; | 113 std::unique_ptr<ui::DisplayConfigurator> display_configurator_; |
| 114 #endif | 114 #endif |
| 115 | 115 |
| 116 scoped_ptr<ShellScreen> screen_; | 116 std::unique_ptr<ShellScreen> screen_; |
| 117 | 117 |
| 118 scoped_ptr<aura::WindowTreeHost> host_; | 118 std::unique_ptr<aura::WindowTreeHost> host_; |
| 119 | 119 |
| 120 scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_; | 120 std::unique_ptr<wm::CompoundEventFilter> root_window_event_filter_; |
| 121 | 121 |
| 122 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; | 122 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; |
| 123 | 123 |
| 124 scoped_ptr<aura::client::FocusClient> focus_client_; | 124 std::unique_ptr<aura::client::FocusClient> focus_client_; |
| 125 | 125 |
| 126 scoped_ptr<wm::CursorManager> cursor_manager_; | 126 std::unique_ptr<wm::CursorManager> cursor_manager_; |
| 127 | 127 |
| 128 scoped_ptr<ui::UserActivityDetector> user_activity_detector_; | 128 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; |
| 129 #if defined(OS_CHROMEOS) | 129 #if defined(OS_CHROMEOS) |
| 130 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; | 130 std::unique_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; |
| 131 #endif | 131 #endif |
| 132 | 132 |
| 133 scoped_ptr<AppWindowClient> app_window_client_; | 133 std::unique_ptr<AppWindowClient> app_window_client_; |
| 134 | 134 |
| 135 // NativeAppWindow::Close() deletes the AppWindow. | 135 // NativeAppWindow::Close() deletes the AppWindow. |
| 136 std::vector<AppWindow*> app_windows_; | 136 std::vector<AppWindow*> app_windows_; |
| 137 | 137 |
| 138 DISALLOW_COPY_AND_ASSIGN(ShellDesktopControllerAura); | 138 DISALLOW_COPY_AND_ASSIGN(ShellDesktopControllerAura); |
| 139 }; | 139 }; |
| 140 | 140 |
| 141 } // namespace extensions | 141 } // namespace extensions |
| 142 | 142 |
| 143 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_ | 143 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_ |
| OLD | NEW |