Index: extensions/shell/browser/shell_desktop_controller_aura.h |
diff --git a/extensions/shell/browser/shell_desktop_controller_aura.h b/extensions/shell/browser/shell_desktop_controller_aura.h |
index 74595250bf2c433431802c936fb993348673d07c..27fae3b82a9b48165a9a0333d6200439a3f40f5f 100644 |
--- a/extensions/shell/browser/shell_desktop_controller_aura.h |
+++ b/extensions/shell/browser/shell_desktop_controller_aura.h |
@@ -5,11 +5,11 @@ |
#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_ |
#define EXTENSIONS_SHELL_BROWSER_SHELL_DESKTOP_CONTROLLER_AURA_H_ |
+#include <memory> |
#include <vector> |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "build/build_config.h" |
#include "extensions/shell/browser/desktop_controller.h" |
#include "ui/aura/client/window_tree_client.h" |
@@ -110,27 +110,27 @@ class ShellDesktopControllerAura |
gfx::Size GetPrimaryDisplaySize(); |
#if defined(OS_CHROMEOS) |
- scoped_ptr<ui::DisplayConfigurator> display_configurator_; |
+ std::unique_ptr<ui::DisplayConfigurator> display_configurator_; |
#endif |
- scoped_ptr<ShellScreen> screen_; |
+ std::unique_ptr<ShellScreen> screen_; |
- scoped_ptr<aura::WindowTreeHost> host_; |
+ std::unique_ptr<aura::WindowTreeHost> host_; |
- scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_; |
+ std::unique_ptr<wm::CompoundEventFilter> root_window_event_filter_; |
- scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; |
+ std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; |
- scoped_ptr<aura::client::FocusClient> focus_client_; |
+ std::unique_ptr<aura::client::FocusClient> focus_client_; |
- scoped_ptr<wm::CursorManager> cursor_manager_; |
+ std::unique_ptr<wm::CursorManager> cursor_manager_; |
- scoped_ptr<ui::UserActivityDetector> user_activity_detector_; |
+ std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; |
#if defined(OS_CHROMEOS) |
- scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; |
+ std::unique_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; |
#endif |
- scoped_ptr<AppWindowClient> app_window_client_; |
+ std::unique_ptr<AppWindowClient> app_window_client_; |
// NativeAppWindow::Close() deletes the AppWindow. |
std::vector<AppWindow*> app_windows_; |