| Index: ash/shell/shell_delegate_impl.cc
|
| diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
|
| index 6fd7660fb96ff41af4fcde704d7562eadb02421a..45e8acbcf33180ffa96bdf9e38a7639292073aed 100644
|
| --- a/ash/shell/shell_delegate_impl.cc
|
| +++ b/ash/shell/shell_delegate_impl.cc
|
| @@ -129,7 +129,7 @@ class SessionStateDelegateImpl : public SessionStateDelegate {
|
| bool screen_locked_;
|
|
|
| // A pseudo user info.
|
| - scoped_ptr<user_manager::UserInfo> user_info_;
|
| + std::unique_ptr<user_manager::UserInfo> user_info_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateImpl);
|
| };
|
|
|