diff --git public/renderer/content_renderer_client.cc public/renderer/content_renderer_client.cc index 245776d..ff26996 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, DocumentState* document_state, @@ -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 5adc6ff..88663e1 100644 --- public/renderer/content_renderer_client.h +++ public/renderer/content_renderer_client.h @@ -193,7 +193,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 @@ -208,7 +207,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 1601fc8..52016a1 100644 --- renderer/render_frame_impl.cc +++ renderer/render_frame_impl.cc @@ -4278,7 +4278,6 @@ void RenderFrameImpl::OnFailedNavigation( WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( RenderFrame* render_frame, const NavigationPolicyInfo& info) { -#ifdef OS_ANDROID // The handlenavigation API is deprecated and will be removed once // crbug.com/325351 is resolved. if (info.urlRequest.url() != GURL(kSwappedOutURL) && @@ -4288,7 +4287,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( info.navigationType, info.defaultPolicy, info.isRedirect)) { return blink::WebNavigationPolicyIgnore; } -#endif Referrer referrer(RenderViewImpl::GetReferrerFromRequest(info.frame, info.urlRequest));