| Index: chrome/browser/chromeos/base/locale_util.cc
|
| diff --git a/chrome/browser/chromeos/base/locale_util.cc b/chrome/browser/chromeos/base/locale_util.cc
|
| index 1499049bf83056c976df6ed4d2c47c7786b8a815..e3c68b883cd68db04929f7a3332f7dd6207e68a7 100644
|
| --- a/chrome/browser/chromeos/base/locale_util.cc
|
| +++ b/chrome/browser/chromeos/base/locale_util.cc
|
| @@ -55,7 +55,7 @@ void SwitchLanguageDoReloadLocale(SwitchLanguageData* data) {
|
| }
|
|
|
| // Callback after SwitchLanguageDoReloadLocale() back in UI thread.
|
| -void FinishSwitchLanguage(scoped_ptr<SwitchLanguageData> data) {
|
| +void FinishSwitchLanguage(std::unique_ptr<SwitchLanguageData> data) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| if (data->result.success) {
|
| g_browser_process->SetApplicationLocale(data->result.loaded_locale);
|
| @@ -115,7 +115,7 @@ void SwitchLanguage(const std::string& locale,
|
| const SwitchLanguageCallback& callback,
|
| Profile* profile) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| - scoped_ptr<SwitchLanguageData> data(
|
| + std::unique_ptr<SwitchLanguageData> data(
|
| new SwitchLanguageData(locale, enable_locale_keyboard_layouts,
|
| login_layouts_only, callback, profile));
|
| base::Closure reloader(
|
|
|