Skip to content

Passing IsMainFrame as parameter to the OnBeforeBrowse #889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amaitland merged 2 commits into from
Mar 18, 2015
Merged

Passing IsMainFrame as parameter to the OnBeforeBrowse #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16bc121
Passing IsMainFrame as parameter to the OnBeforeBrowse
Mar 18, 2015
bc56e2f
Adding comment for the IsMainFrame parameter
Mar 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CefSharp.Core/Internals/ClientAdapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ namespace CefSharp

CefRequestWrapper^ wrapper = gcnew CefRequestWrapper(request);

return handler->OnBeforeBrowse(_browserControl, wrapper, isRedirect);
return handler->OnBeforeBrowse(_browserControl, wrapper, isRedirect, frame->IsMain());
}

bool ClientAdapter::OnCertificateError(cef_errorcode_t cert_error, const CefString& request_url, CefRefPtr<CefAllowCertificateErrorCallback> callback)
Expand Down
2 changes: 1 addition & 1 deletion CefSharp.Example/RequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public class RequestHandler : IRequestHandler
public static readonly string VersionNumberString = String.Format("Chromium: {0}, CEF: {1}, CefSharp: {2}",
Cef.ChromiumVersion, Cef.CefVersion, Cef.CefSharpVersion);

bool IRequestHandler.OnBeforeBrowse(IWebBrowser browser, IRequest request, bool isRedirect)
bool IRequestHandler.OnBeforeBrowse(IWebBrowser browser, IRequest request, bool isRedirect, bool isMainFrame)
{
return false;
}
Expand Down
3 changes: 2 additions & 1 deletion CefSharp/IRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ public interface IRequestHandler
/// <param name="browser">the browser object</param>
/// <param name="request">the request object - cannot be modified in this callback</param>
/// <param name="isRedirect">has the request been redirected</param>
Copy link
Member

@amaitland amaitland Mar 18, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add additional please?

Copy link
Contributor Author

@mohdimas mohdimas Mar 18, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added.

/// <param name="isMainFrame">whether the request comes from main frame or not</param>
/// <returns>Return true to cancel the navigation or false to allow the navigation to proceed.</returns>
bool OnBeforeBrowse(IWebBrowser browser, IRequest request, bool isRedirect);
bool OnBeforeBrowse(IWebBrowser browser, IRequest request, bool isRedirect, bool isMainFrame);

/// <summary>
/// Called when a certificate error is thrown.
Expand Down