Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(630)

Unified Diff: chrome/browser/chromeos/login/screens/network_screen.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/screens/network_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/network_screen.cc b/chrome/browser/chromeos/login/screens/network_screen.cc
index 1537199f56ee7dfff59657d28340bf8120933ab2..3bce5096dca0a8701d03981eb2ae98c9357f11f0 100644
--- a/chrome/browser/chromeos/login/screens/network_screen.cc
+++ b/chrome/browser/chromeos/login/screens/network_screen.cc
@@ -156,7 +156,8 @@ const base::ListValue* NetworkScreen::GetLanguageList() const {
}
void NetworkScreen::UpdateLanguageList() {
- ScheduleResolveLanguageList(scoped_ptr<locale_util::LanguageSwitchResult>());
+ ScheduleResolveLanguageList(
+ std::unique_ptr<locale_util::LanguageSwitchResult>());
}
////////////////////////////////////////////////////////////////////////////////
@@ -409,22 +410,23 @@ void NetworkScreen::OnLanguageChangedCallback(
g_browser_process->local_state()->SetString(prefs::kApplicationLocale,
selected_language_code_);
}
- ScheduleResolveLanguageList(scoped_ptr<locale_util::LanguageSwitchResult>(
- new locale_util::LanguageSwitchResult(result)));
+ ScheduleResolveLanguageList(
+ std::unique_ptr<locale_util::LanguageSwitchResult>(
+ new locale_util::LanguageSwitchResult(result)));
AccessibilityManager::Get()->OnLocaleChanged();
SetInputMethod(input_method);
}
void NetworkScreen::ScheduleResolveLanguageList(
- scoped_ptr<locale_util::LanguageSwitchResult> language_switch_result) {
+ std::unique_ptr<locale_util::LanguageSwitchResult> language_switch_result) {
UILanguageListResolvedCallback callback = base::Bind(
&NetworkScreen::OnLanguageListResolved, weak_factory_.GetWeakPtr());
ResolveUILanguageList(std::move(language_switch_result), callback);
}
void NetworkScreen::OnLanguageListResolved(
- scoped_ptr<base::ListValue> new_language_list,
+ std::unique_ptr<base::ListValue> new_language_list,
const std::string& new_language_list_locale,
const std::string& new_selected_language) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

Powered by Google App Engine
This is Rietveld 408576698