| Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| index 94fa12b7f33bea82fe9fcecb2e46501a7fc8df57..908c9d08f47c1bf9ba21b531426bedea6b6152d3 100644
|
| --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
|
| @@ -205,7 +205,7 @@ struct ShowLoginWizardSwitchLanguageCallbackData {
|
| };
|
|
|
| void OnLanguageSwitchedCallback(
|
| - scoped_ptr<ShowLoginWizardSwitchLanguageCallbackData> self,
|
| + std::unique_ptr<ShowLoginWizardSwitchLanguageCallbackData> self,
|
| const chromeos::locale_util::LanguageSwitchResult& result) {
|
| if (!result.success)
|
| LOG(WARNING) << "Locale could not be found for '" << result.requested_locale
|
| @@ -1258,7 +1258,7 @@ void ShowLoginWizard(const std::string& first_screen_name) {
|
| prefs->SetString(prefs::kApplicationLocale, locale);
|
| StartupUtils::SetInitialLocale(locale);
|
|
|
| - scoped_ptr<ShowLoginWizardSwitchLanguageCallbackData> data(
|
| + std::unique_ptr<ShowLoginWizardSwitchLanguageCallbackData> data(
|
| new ShowLoginWizardSwitchLanguageCallbackData(
|
| first_screen_name, startup_manifest, display_host));
|
|
|
|
|