diff --git a/libcef/browser/net_service/resource_request_handler_wrapper.cc b/libcef/browser/net_service/resource_request_handler_wrapper.cc index 8812d3acd0fc4bc296bb2f66d0a2dd376b6436e9..5f867dc9f53fb02a992a4995671dbea34f83ddb1 100644 --- a/libcef/browser/net_service/resource_request_handler_wrapper.cc +++ b/libcef/browser/net_service/resource_request_handler_wrapper.cc @@ -753,81 +753,6 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler { static_cast(request.transition_type))); } } - - void GetOhosResourceHandlerResult( - int32_t request_id, - network::ResourceRequest* request, - CefRefPtr resource_handler, - ShouldInterceptRequestResultCallback callback) { - CEF_REQUIRE_IOT(); - RequestState* state = GetState(request_id); - if (!state) { - std::move(callback).Run(nullptr); - return; - } - - if (!resource_handler && state->scheme_factory_) { - // Does the scheme factory want to handle the request? - resource_handler = state->scheme_factory_->Create( - init_state_->browser_, init_state_->frame_, request->url.scheme(), - state->pending_request_.get()); - } - - std::unique_ptr resource_response; - if (resource_handler) { - resource_response = CreateResourceResponse(request_id, resource_handler); - DCHECK(resource_response); - state->was_custom_handled_ = true; - } else { - // The request will be handled by the NetworkService. Remove the - // "Accept-Language" header here so that it can be re-added in - // URLRequestHttpJob::AddExtraHeaders with correct ordering applied. - } - - // Continue the request. - std::move(callback).Run(std::move(resource_response)); - } - - void GetOhosResourceHandlerInUiTask( - int32_t request_id, - network::ResourceRequest* request, - ShouldInterceptRequestResultCallback callback) { - CEF_REQUIRE_UIT(); - RequestState* state = GetState(request_id); - if (!state) { - std::move(callback).Run(nullptr); - return; - } - CefRefPtr resource_handler; - - if (state->handler_) { - // Does the client want to handle the request? - if (request) { - state->pending_request_->SetDestination(request->destination); - } - resource_handler = state->handler_->GetResourceHandler( - init_state_->browser_, init_state_->frame_, - state->pending_request_.get()); - } - - CEF_POST_TASK( - CEF_IOT, - base::BindOnce( - &InterceptedRequestHandlerWrapper::GetOhosResourceHandlerResult, - weak_ptr_factory_.GetWeakPtr(), request_id, request, - resource_handler, std::move(callback))); - } - - void GetOhosResourceHandler(int32_t request_id, - network::ResourceRequest* request, - ShouldInterceptRequestResultCallback callback) { - CEF_POST_TASK( - CEF_UIT, - base::BindOnce( - &InterceptedRequestHandlerWrapper::GetOhosResourceHandlerInUiTask, - weak_ptr_factory_.GetWeakPtr(), request_id, request, - std::move(callback))); - } #endif void ContinueShouldInterceptRequest( @@ -878,9 +803,6 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler { return; } } -#if BUILDFLAG(IS_OHOS) - GetOhosResourceHandler(request_id, request, std::move(callback)); -#else CefRefPtr resource_handler; @@ -913,7 +835,6 @@ class InterceptedRequestHandlerWrapper : public InterceptedRequestHandler { // Continue the request. std::move(callback).Run(std::move(resource_response)); -#endif } void ProcessResponseHeaders(int32_t request_id,