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 45686b5..18548a0 100644 --- public/renderer/content_renderer_client.h +++ public/renderer/content_renderer_client.h @@ -194,7 +194,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 @@ -209,7 +208,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 16d742f..f9e4238 100644 --- renderer/render_frame_impl.cc +++ renderer/render_frame_impl.cc @@ -4687,7 +4687,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) && @@ -4697,7 +4696,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( is_redirect)) { return blink::WebNavigationPolicyIgnore; } -#endif Referrer referrer( RenderViewImpl::GetReferrerFromRequest(frame_, info.urlRequest));