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

Unified Diff: chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc

Issue 2812953002: Stop passing raw pointers to base::Value API in c/b/ui (Closed)
Patch Set: Rebased 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/media_router/media_router_webui_message_handler.cc
diff --git a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc
index f4ac35ecee5bad3a4bc300535d1001db306df141..62a370a32e81d0f1e8fda94e5bc02cac19f26cc3 100644
--- a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc
@@ -131,7 +131,7 @@ std::unique_ptr<base::DictionaryValue> SinksAndIdentityToValue(
sinks_val->Append(std::move(sink_val));
}
- sink_list_and_identity->Set("sinks", sinks_val.release());
+ sink_list_and_identity->Set("sinks", std::move(sinks_val));
sink_list_and_identity->SetBoolean("showEmail", show_email);
sink_list_and_identity->SetBoolean("showDomain", show_domain);
return sink_list_and_identity;
@@ -414,17 +414,17 @@ void MediaRouterWebUIMessageHandler::OnRequestInitialData(
std::unique_ptr<base::DictionaryValue> sinks_and_identity(
SinksAndIdentityToValue(media_router_ui_->sinks(), GetAccountInfo()));
- initial_data.Set("sinksAndIdentity", sinks_and_identity.release());
+ initial_data.Set("sinksAndIdentity", std::move(sinks_and_identity));
std::unique_ptr<base::ListValue> routes(RoutesToValue(
media_router_ui_->routes(), media_router_ui_->joinable_route_ids(),
media_router_ui_->routes_and_cast_modes()));
- initial_data.Set("routes", routes.release());
+ initial_data.Set("routes", std::move(routes));
const std::set<MediaCastMode> cast_modes = media_router_ui_->cast_modes();
std::unique_ptr<base::ListValue> cast_modes_list(CastModesToValue(
cast_modes, media_router_ui_->GetPresentationRequestSourceName()));
- initial_data.Set("castModes", cast_modes_list.release());
+ initial_data.Set("castModes", std::move(cast_modes_list));
// If the cast mode last chosen for the current origin is tab mirroring,
// that should be the cast mode initially selected in the dialog. Otherwise

Powered by Google App Engine
This is Rietveld 408576698