Index: chrome/browser/chromeos/chrome_browser_main_chromeos.h |
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h |
index dcaa96584a3437558f0f70547b99caab40ed1342..8c157f54e7c3485679f0ac45a0c833ee7a20d1da 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h |
@@ -5,8 +5,9 @@ |
#ifndef CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ |
#define CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/task/cancelable_task_tracker.h" |
#include "chrome/browser/chrome_browser_main_linux.h" |
#include "chrome/browser/chromeos/external_metrics.h" |
@@ -66,27 +67,27 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux { |
void PostDestroyThreads() override; |
private: |
- scoped_ptr<default_app_order::ExternalLoader> app_order_loader_; |
- scoped_ptr<PeripheralBatteryObserver> peripheral_battery_observer_; |
- scoped_ptr<PowerPrefs> power_prefs_; |
- scoped_ptr<PowerButtonObserver> power_button_observer_; |
- scoped_ptr<IdleActionWarningObserver> idle_action_warning_observer_; |
- scoped_ptr<DataPromoNotification> data_promo_notification_; |
- scoped_ptr<RendererFreezer> renderer_freezer_; |
- scoped_ptr<WakeOnWifiManager> wake_on_wifi_manager_; |
+ std::unique_ptr<default_app_order::ExternalLoader> app_order_loader_; |
+ std::unique_ptr<PeripheralBatteryObserver> peripheral_battery_observer_; |
+ std::unique_ptr<PowerPrefs> power_prefs_; |
+ std::unique_ptr<PowerButtonObserver> power_button_observer_; |
+ std::unique_ptr<IdleActionWarningObserver> idle_action_warning_observer_; |
+ std::unique_ptr<DataPromoNotification> data_promo_notification_; |
+ std::unique_ptr<RendererFreezer> renderer_freezer_; |
+ std::unique_ptr<WakeOnWifiManager> wake_on_wifi_manager_; |
- scoped_ptr<internal::DBusServices> dbus_services_; |
+ std::unique_ptr<internal::DBusServices> dbus_services_; |
- scoped_ptr<session_manager::SessionManager> session_manager_; |
+ std::unique_ptr<session_manager::SessionManager> session_manager_; |
- scoped_ptr<EventRewriterController> keyboard_event_rewriters_; |
+ std::unique_ptr<EventRewriterController> keyboard_event_rewriters_; |
scoped_refptr<chromeos::ExternalMetrics> external_metrics_; |
- scoped_ptr<arc::ArcServiceLauncher> arc_service_launcher_; |
+ std::unique_ptr<arc::ArcServiceLauncher> arc_service_launcher_; |
#if defined(MOJO_SHELL_CLIENT) |
- scoped_ptr<ChromeInterfaceFactory> interface_factory_; |
+ std::unique_ptr<ChromeInterfaceFactory> interface_factory_; |
#endif |
DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); |