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

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

Issue 2820823005: Revert of Stop passing raw pointers to base::Value API in c/b/ui (Closed)
Patch Set: Created 3 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 336d10c62b1f873f8d37ffb405cbf272a81e53fc..e20720e8d0e8147d7d4e4d715784590451efd520 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
@@ -246,10 +246,11 @@
const bool enable_layouts =
!user_manager::UserManager::Get()->IsUserLoggedIn() && !is_slave;
- dict->Set("languageList", std::move(language_list));
- dict->Set("inputMethodsList",
- GetAndActivateLoginKeyboardLayouts(
- application_locale, selected_input_method, enable_layouts));
+ dict->Set("languageList", language_list.release());
+ dict->Set(
+ "inputMethodsList",
+ GetAndActivateLoginKeyboardLayouts(
+ application_locale, selected_input_method, enable_layouts).release());
dict->Set("timezoneList", GetTimezoneList());
}
@@ -267,7 +268,7 @@
// NetworkScreenHandler, private: ----------------------------------------------
// static
-std::unique_ptr<base::ListValue> NetworkScreenHandler::GetTimezoneList() {
+base::ListValue* NetworkScreenHandler::GetTimezoneList() {
std::string current_timezone_id;
CrosSettings::Get()->GetString(kSystemTimezone, &current_timezone_id);
@@ -291,7 +292,7 @@
timezone_list->Append(std::move(timezone_option));
}
- return timezone_list;
+ return timezone_list.release();
}
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698