Skip to content

Commit fe59df9

Browse files
committed
Cleanup OnBeforeResourceLoad - Remove IResponse and Response classes, to perform Redirect simply set the IRequest.Url
1 parent 201053b commit fe59df9

6 files changed

Lines changed: 9 additions & 63 deletions

File tree

‎CefSharp.Core/Internals/ClientAdapter.cpp‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -351,20 +351,8 @@ namespace CefSharp
351351
}
352352

353353
auto requestWrapper = gcnew CefRequestWrapper(request);
354-
auto response = gcnew Response();
355354

356-
bool ret = handler->OnBeforeResourceLoad(_browserControl, requestWrapper, response, frame->IsMain());
357-
358-
if (response->Action == ResponseAction::Redirect)
359-
{
360-
request->SetURL(StringUtils::ToNative(response->RedirectUrl));
361-
}
362-
else if (response->Action == ResponseAction::Cancel)
363-
{
364-
return true;
365-
}
366-
367-
return ret;
355+
return handler->OnBeforeResourceLoad(_browserControl, requestWrapper, frame->IsMain());
368356
}
369357

370358
CefRefPtr<CefDownloadHandler> ClientAdapter::GetDownloadHandler()

‎CefSharp.Example/RequestHandler.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,14 @@ void IRequestHandler.OnPluginCrashed(IWebBrowser browser, string pluginPath)
2222
// TODO: Add your own code here for handling scenarios where a plugin crashed, for one reason or another.
2323
}
2424

25-
bool IRequestHandler.OnBeforeResourceLoad(IWebBrowser browser, IRequest request, IResponse response, bool isMainFrame)
25+
bool IRequestHandler.OnBeforeResourceLoad(IWebBrowser browser, IRequest request, bool isMainFrame)
2626
{
27+
//Note to Redirect simply set the request Url
28+
//if (request.Url.StartsWith("https://www.google.com", StringComparison.OrdinalIgnoreCase))
29+
//{
30+
// request.Url = "https://github.com/";
31+
//}
32+
2733
return false;
2834
}
2935

‎CefSharp/CefSharp.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
<Compile Include="Internals\WCFExtensions.cs" />
127127
<Compile Include="KeyType.cs" />
128128
<Compile Include="ResourceHandler.cs" />
129-
<Compile Include="Response.cs" />
130129
<Compile Include="ResponseAction.cs" />
131130
<Compile Include="ScreenInfo.cs" />
132131
<Compile Include="TransitionType.cs" />
@@ -152,7 +151,6 @@
152151
<Compile Include="WebPluginInfo.cs" />
153152
<Compile Include="IRequest.cs" />
154153
<Compile Include="IRequestHandler.cs" />
155-
<Compile Include="IResponse.cs" />
156154
<Compile Include="ISchemeHandler.cs" />
157155
<Compile Include="ISchemeHandlerFactory.cs" />
158156
<Compile Include="ISchemeHandlerResponse.cs" />

‎CefSharp/IRequestHandler.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@ public interface IRequestHandler
4040
/// </summary>
4141
/// <param name="browser">the browser object</param>
4242
/// <param name="request">the request object - can be modified in this callback.</param>
43-
/// <param name="response">the request object - can be modified in this callback.</param>
4443
/// /// <param name="isMainFrame">whether the request comes from main frame or not</param>
4544
/// <returns>To cancel loading of the resource return true or false to allow the resource to load normally.</returns>
46-
bool OnBeforeResourceLoad(IWebBrowser browser, IRequest request, IResponse response, bool isMainFrame);
45+
bool OnBeforeResourceLoad(IWebBrowser browser, IRequest request, bool isMainFrame);
4746

4847
/// <summary>
4948
/// Called when the browser needs credentials from the user.

‎CefSharp/IResponse.cs‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎CefSharp/Response.cs‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)