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

Unified Diff: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

Issue 1865213004: Convert //chrome/browser/ui 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/ui/webui/chromeos/login/network_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
index 712bd4483507c19d245743fcb7e4f37845a8b300..2f69776877fc45892b67e43e5c615bd201658c6d 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
@@ -174,7 +174,7 @@ void NetworkScreenHandler::GetAdditionalParameters(
->GetCurrentInputMethod()
.id();
- scoped_ptr<base::ListValue> language_list;
+ std::unique_ptr<base::ListValue> language_list;
if (model_) {
if (model_->GetLanguageList() &&
model_->GetLanguageListLocale() == application_locale) {
@@ -243,8 +243,8 @@ base::ListValue* NetworkScreenHandler::GetTimezoneList() {
std::string current_timezone_id;
CrosSettings::Get()->GetString(kSystemTimezone, &current_timezone_id);
- scoped_ptr<base::ListValue> timezone_list(new base::ListValue);
- scoped_ptr<base::ListValue> timezones = system::GetTimezoneList();
+ std::unique_ptr<base::ListValue> timezone_list(new base::ListValue);
+ std::unique_ptr<base::ListValue> timezones = system::GetTimezoneList();
for (size_t i = 0; i < timezones->GetSize(); ++i) {
const base::ListValue* timezone = NULL;
CHECK(timezones->GetList(i, &timezone));
@@ -255,7 +255,7 @@ base::ListValue* NetworkScreenHandler::GetTimezoneList() {
std::string timezone_name;
CHECK(timezone->GetString(1, &timezone_name));
- scoped_ptr<base::DictionaryValue> timezone_option(
+ std::unique_ptr<base::DictionaryValue> timezone_option(
new base::DictionaryValue);
timezone_option->SetString("value", timezone_id);
timezone_option->SetString("title", timezone_name);

Powered by Google App Engine
This is Rietveld 408576698