| Index: chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
|
| diff --git a/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm b/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
|
| index 106383fbc252c84bdd605b0029fdbecf1a7ac174..fa604eaeb026895dacf68c38d5e1d36c18fb3213 100644
|
| --- a/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
|
| +++ b/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
|
| @@ -107,7 +107,7 @@ class UserManagerModalManagerDelegate :
|
|
|
| ~UserManagerModalManagerDelegate() override {}
|
| protected:
|
| - scoped_ptr<UserManagerModalHost> modal_host_;
|
| + std::unique_ptr<UserManagerModalHost> modal_host_;
|
| };
|
|
|
| // Custom WebContentsDelegate that allows handling of hotkeys.
|
| @@ -164,9 +164,9 @@ class ReauthDialogDelegate : public UserManager::ReauthDialogObserver,
|
| @private
|
| std::string emailAddress_;
|
| content::WebContents* webContents_;
|
| - scoped_ptr<ReauthDialogDelegate> webContentsDelegate_;
|
| - scoped_ptr<ConstrainedWindowMac> constrained_window_;
|
| - scoped_ptr<content::WebContents> reauthWebContents_;
|
| + std::unique_ptr<ReauthDialogDelegate> webContentsDelegate_;
|
| + std::unique_ptr<ConstrainedWindowMac> constrained_window_;
|
| + std::unique_ptr<content::WebContents> reauthWebContents_;
|
| }
|
| - (id)initWithProfile:(Profile*)profile
|
| email:(std::string)email
|
| @@ -245,10 +245,10 @@ class ReauthDialogDelegate : public UserManager::ReauthDialogObserver,
|
| // Window controller for the User Manager view.
|
| @interface UserManagerWindowController : NSWindowController <NSWindowDelegate> {
|
| @private
|
| - scoped_ptr<content::WebContents> webContents_;
|
| - scoped_ptr<UserManagerWebContentsDelegate> webContentsDelegate_;
|
| + std::unique_ptr<content::WebContents> webContents_;
|
| + std::unique_ptr<UserManagerWebContentsDelegate> webContentsDelegate_;
|
| UserManagerMac* userManagerObserver_; // Weak.
|
| - scoped_ptr<UserManagerModalManagerDelegate> modal_manager_delegate_;
|
| + std::unique_ptr<UserManagerModalManagerDelegate> modal_manager_delegate_;
|
| base::scoped_nsobject<ReauthDialogWindowController> reauth_window_controller_;
|
| }
|
| - (void)windowWillClose:(NSNotification*)notification;
|
|
|