chylex/TweetDuck
1
0
Fork 0
mirror of https://github.com/chylex/TweetDuck.git synced 2025-04-23 12:15:48 +02:00
Code

Minor RequestHandlerBase refactoring

Browse Source
This commit is contained in:
chylex 2018-06-05 02:05:04 +02:00
parent 27c55718c2
commit b7f325a241
4 changed files with 15 additions and 5 deletions

12
Core/Handling/RequestHandlerBase.cs
View File

@ -5,6 +5,12 @@
namespace TweetDuck.Core.Handling{
class RequestHandlerBase : DefaultRequestHandler{
private readonly bool autoReload;
public RequestHandlerBase(bool autoReload){
this.autoReload = autoReload;
}
public override bool OnOpenUrlFromTab(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, WindowOpenDisposition targetDisposition, bool userGesture){
return LifeSpanHandler.HandleLinkClick(browserControl, targetDisposition, targetUrl);
}
@ -18,5 +24,11 @@ public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl,
return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
}
public override void OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status){
if (autoReload){
browser.Reload();
}
}
}
}

4
Core/Handling/RequestHandlerBrowser.cs
View File

@ -3,9 +3,7 @@
namespace TweetDuck.Core.Handling{
sealed class RequestHandlerBrowser : RequestHandlerBase{
public override void OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status){
browser.Reload();
}
public RequestHandlerBrowser() : base(true){}
public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
if (request.ResourceType == ResourceType.Script && request.Url.Contains("analytics.")){

2
Core/Notification/FormNotificationBase.cs
View File

@ -124,7 +124,7 @@ protected FormNotificationBase(FormBrowser owner, bool enableContextMenu){
MenuHandler = new ContextMenuNotification(this, enableContextMenu),
JsDialogHandler = new JavaScriptDialogHandler(),
LifeSpanHandler = new LifeSpanHandler(),
RequestHandler = new RequestHandlerBase()
RequestHandler = new RequestHandlerBase(false)
};
this.browser.Dock = DockStyle.None;

2
Core/Other/FormGuide.cs
View File

@ -69,7 +69,7 @@ private FormGuide(string url, FormBrowser owner){
MenuHandler = new ContextMenuGuide(owner),
JsDialogHandler = new JavaScriptDialogHandler(),
LifeSpanHandler = new LifeSpanHandler(),
RequestHandler = new RequestHandlerBrowser()
RequestHandler = new RequestHandlerBase(true)
};
browser.LoadingStateChanged += browser_LoadingStateChanged;