mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-16 20:02:24 +01:00
c6111d5947
- Improve ordering of CefLoadHandler callbacks. OnLoadingStateChange will be called before and after all calls to OnLoadStart and OnLoadEnd. OnLoadStart/OnLoadEnd calls will occur as matching pairs (see http://crbug.com/539952#c2). - Remove the |requesting_url| argument to CefGeolocationHandler:: OnCancelGeolocationPermission. Clients can use the |request_id| argument to track this information themselves. - Fix a crash when loading the PDF extension in multiple browsers with a custom CefRequestContext (issue #1757).
61 lines
2.5 KiB
Diff
61 lines
2.5 KiB
Diff
diff --git public/renderer/content_renderer_client.cc public/renderer/content_renderer_client.cc
|
|
index 3d0316f..ccd1f58 100644
|
|
--- public/renderer/content_renderer_client.cc
|
|
+++ public/renderer/content_renderer_client.cc
|
|
@@ -98,7 +98,6 @@ bool ContentRendererClient::AllowPopup() {
|
|
return false;
|
|
}
|
|
|
|
-#ifdef OS_ANDROID
|
|
bool ContentRendererClient::HandleNavigation(
|
|
RenderFrame* render_frame,
|
|
bool is_content_initiated,
|
|
@@ -110,7 +109,6 @@ bool ContentRendererClient::HandleNavigation(
|
|
bool is_redirect) {
|
|
return false;
|
|
}
|
|
-#endif
|
|
|
|
bool ContentRendererClient::ShouldFork(blink::WebLocalFrame* frame,
|
|
const GURL& url,
|
|
diff --git public/renderer/content_renderer_client.h public/renderer/content_renderer_client.h
|
|
index f55c691..0aeb1b24 100644
|
|
--- public/renderer/content_renderer_client.h
|
|
+++ public/renderer/content_renderer_client.h
|
|
@@ -192,7 +192,6 @@ class CONTENT_EXPORT ContentRendererClient {
|
|
// Returns true if a popup window should be allowed.
|
|
virtual bool AllowPopup();
|
|
|
|
-#ifdef OS_ANDROID
|
|
// TODO(sgurun) This callback is deprecated and will be removed as soon
|
|
// as android webview completes implementation of a resource throttle based
|
|
// shouldoverrideurl implementation. See crbug.com/325351
|
|
@@ -207,7 +206,6 @@ class CONTENT_EXPORT ContentRendererClient {
|
|
blink::WebNavigationType type,
|
|
blink::WebNavigationPolicy default_policy,
|
|
bool is_redirect);
|
|
-#endif
|
|
|
|
// Returns true if we should fork a new process for the given navigation.
|
|
// If |send_referrer| is set to false (which is the default), no referrer
|
|
diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc
|
|
index 33219e5..f6aac25 100644
|
|
--- renderer/render_frame_impl.cc
|
|
+++ renderer/render_frame_impl.cc
|
|
@@ -4395,7 +4395,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
|
|
(pending_navigation_params_ &&
|
|
!pending_navigation_params_->request_params.redirects.empty());
|
|
|
|
-#ifdef OS_ANDROID
|
|
// The handlenavigation API is deprecated and will be removed once
|
|
// crbug.com/325351 is resolved.
|
|
if (info.urlRequest.url() != GURL(kSwappedOutURL) &&
|
|
@@ -4405,7 +4404,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
|
|
is_redirect)) {
|
|
return blink::WebNavigationPolicyIgnore;
|
|
}
|
|
-#endif
|
|
|
|
Referrer referrer(
|
|
RenderViewImpl::GetReferrerFromRequest(frame_, info.urlRequest));
|