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

Unified Diff: chrome/browser/ui/webui/options/browser_options_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/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index c9763227808cc8abd7284e8f202e1c4b1bdd7731..f851526ad327708036afcd63bc278cc078aab21b 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -166,7 +166,7 @@
std::unique_ptr<base::DictionaryValue> details(new base::DictionaryValue);
details->SetString("id", extension ? extension->id() : std::string());
details->SetString("name", extension ? extension->name() : std::string());
- dict->Set(key, std::move(details));
+ dict->Set(key, details.release());
}
#if !defined(OS_CHROMEOS)
@@ -662,7 +662,7 @@
values->SetString("username", username);
#endif
// Pass along sync status early so it will be available during page init.
- values->Set("syncData", GetSyncStateDictionary());
+ values->Set("syncData", GetSyncStateDictionary().release());
values->SetString("privacyLearnMoreURL", chrome::kPrivacyLearnMoreURL);
@@ -675,7 +675,7 @@
#if defined(OS_CHROMEOS)
// TODO(pastarmovj): replace this with a call to the CrosSettings list
// handling functionality to come.
- values->Set("timezoneList", chromeos::system::GetTimezoneList());
+ values->Set("timezoneList", chromeos::system::GetTimezoneList().release());
values->SetString("accessibilityLearnMoreURL",
chrome::kChromeAccessibilityHelpURL);
@@ -705,7 +705,7 @@
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL));
magnifier_list->Append(std::move(option_partial));
- values->Set("magnifierList", std::move(magnifier_list));
+ values->Set("magnifierList", magnifier_list.release());
values->SetBoolean("enablePolymerPreload", g_enable_polymer_preload);
#endif // defined(OS_CHROMEOS)
@@ -717,7 +717,7 @@
#endif
if (ShouldShowMultiProfilesUserList())
- values->Set("profilesInfo", GetProfilesInfoList());
+ values->Set("profilesInfo", GetProfilesInfoList().release());
// Profile deletion is not allowed for any users in ChromeOS.
bool allow_deletion = true;

Powered by Google App Engine
This is Rietveld 408576698