Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h |
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h |
index e1a729abf386e9268c15a7ce5c860d82e1ac3981..03ad69bde70df582330e70e7950643761a82a36b 100644 |
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h |
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h |
@@ -6,12 +6,12 @@ |
#define CHROME_BROWSER_UI_ASH_MULTI_USER_MULTI_USER_WINDOW_MANAGER_CHROMEOS_H_ |
#include <map> |
+#include <memory> |
#include <string> |
#include "ash/session/session_state_observer.h" |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/observer_list.h" |
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" |
#include "components/signin/core/account_id/account_id.h" |
@@ -243,7 +243,7 @@ class MultiUserWindowManagerChromeOS |
// The blocker which controls the desktop notification visibility based on the |
// current multi-user status. |
- scoped_ptr<MultiUserNotificationBlockerChromeOS> notification_blocker_; |
+ std::unique_ptr<MultiUserNotificationBlockerChromeOS> notification_blocker_; |
// The notification registrar to track the creation of browser windows. |
content::NotificationRegistrar registrar_; |
@@ -255,7 +255,7 @@ class MultiUserWindowManagerChromeOS |
AnimationSpeed animation_speed_; |
// The animation between users. |
- scoped_ptr<UserSwitchAnimatorChromeOS> animation_; |
+ std::unique_ptr<UserSwitchAnimatorChromeOS> animation_; |
DISALLOW_COPY_AND_ASSIGN(MultiUserWindowManagerChromeOS); |
}; |