Index: chrome/browser/chromeos/login/screens/user_image_screen.h |
diff --git a/chrome/browser/chromeos/login/screens/user_image_screen.h b/chrome/browser/chromeos/login/screens/user_image_screen.h |
index 221e715ae9c2b7256bcc2a05276d85f4940a42e4..338d3739d0efcf00a3adbd81d4642fcf4ff41afa 100644 |
--- a/chrome/browser/chromeos/login/screens/user_image_screen.h |
+++ b/chrome/browser/chromeos/login/screens/user_image_screen.h |
@@ -5,9 +5,10 @@ |
#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_IMAGE_SCREEN_H_ |
#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_IMAGE_SCREEN_H_ |
+#include <memory> |
+ |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/time/time.h" |
#include "chrome/browser/chromeos/camera_presence_notifier.h" |
#include "chrome/browser/chromeos/login/screens/base_screen.h" |
@@ -117,7 +118,7 @@ class UserImageScreen : public UserImageModel, |
content::NotificationRegistrar notification_registrar_; |
- scoped_ptr<policy::PolicyChangeRegistrar> policy_registrar_; |
+ std::unique_ptr<policy::PolicyChangeRegistrar> policy_registrar_; |
UserImageView* view_; |
@@ -133,7 +134,7 @@ class UserImageScreen : public UserImageModel, |
int selected_image_; |
// Timer used for waiting for user image sync. |
- scoped_ptr<base::Timer> sync_timer_; |
+ std::unique_ptr<base::Timer> sync_timer_; |
// If screen ready to be shown. |
bool is_screen_ready_; |