| Index: content/browser/renderer_host/render_message_filter.cc
|
| diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
|
| index da4804e730148e3180fcc2e2d068ac44f511aaf0..718d381e2e7c6eae3420a60cff738fa2eccddc73 100644
|
| --- a/content/browser/renderer_host/render_message_filter.cc
|
| +++ b/content/browser/renderer_host/render_message_filter.cc
|
| @@ -195,13 +195,13 @@ void RenderMessageFilter::OverrideThreadForMessage(const IPC::Message& message,
|
| }
|
|
|
| void RenderMessageFilter::GenerateRoutingID(
|
| - const GenerateRoutingIDCallback& callback) {
|
| - callback.Run(render_widget_helper_->GetNextRoutingID());
|
| + GenerateRoutingIDCallback callback) {
|
| + std::move(callback).Run(render_widget_helper_->GetNextRoutingID());
|
| }
|
|
|
| void RenderMessageFilter::CreateNewWindow(
|
| mojom::CreateNewWindowParamsPtr params,
|
| - const CreateNewWindowCallback& callback) {
|
| + CreateNewWindowCallback callback) {
|
| bool no_javascript_access;
|
| bool can_create_window = GetContentClient()->browser()->CanCreateWindow(
|
| render_process_id_, params->opener_render_frame_id, params->opener_url,
|
| @@ -217,7 +217,7 @@ void RenderMessageFilter::CreateNewWindow(
|
| reply->main_frame_route_id = MSG_ROUTING_NONE;
|
| reply->main_frame_widget_route_id = MSG_ROUTING_NONE;
|
| reply->cloned_session_storage_namespace_id = 0;
|
| - return callback.Run(std::move(reply));
|
| + return std::move(callback).Run(std::move(reply));
|
| }
|
|
|
| // This will clone the sessionStorage for namespace_id_to_clone.
|
| @@ -230,24 +230,23 @@ void RenderMessageFilter::CreateNewWindow(
|
| std::move(params), no_javascript_access, &reply->route_id,
|
| &reply->main_frame_route_id, &reply->main_frame_widget_route_id,
|
| cloned_namespace.get());
|
| - callback.Run(std::move(reply));
|
| + std::move(callback).Run(std::move(reply));
|
| }
|
|
|
| -void RenderMessageFilter::CreateNewWidget(
|
| - int32_t opener_id,
|
| - blink::WebPopupType popup_type,
|
| - const CreateNewWidgetCallback& callback) {
|
| +void RenderMessageFilter::CreateNewWidget(int32_t opener_id,
|
| + blink::WebPopupType popup_type,
|
| + CreateNewWidgetCallback callback) {
|
| int route_id = MSG_ROUTING_NONE;
|
| render_widget_helper_->CreateNewWidget(opener_id, popup_type, &route_id);
|
| - callback.Run(route_id);
|
| + std::move(callback).Run(route_id);
|
| }
|
|
|
| void RenderMessageFilter::CreateFullscreenWidget(
|
| int opener_id,
|
| - const CreateFullscreenWidgetCallback& callback) {
|
| + CreateFullscreenWidgetCallback callback) {
|
| int route_id = 0;
|
| render_widget_helper_->CreateNewFullscreenWidget(opener_id, &route_id);
|
| - callback.Run(route_id);
|
| + std::move(callback).Run(route_id);
|
| }
|
|
|
| void RenderMessageFilter::GetSharedBitmapManager(
|
|
|