Use a resource throttle to implement shouldOverrideUrlLoading.

android_webview/renderer/aw_content_renderer_client.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/renderer/aw_content_renderer_client.h"
 
 #include "android_webview/common/aw_resource.h"
 #include "android_webview/common/render_view_messages.h"
 #include "android_webview/common/url_constants.h"
 #include "android_webview/renderer/aw_content_settings_client.h"
@@ skipping 47 matching lines @@
 
   RenderThread* thread = RenderThread::Get();
 
   aw_render_process_observer_.reset(new AwRenderProcessObserver);
   thread->AddObserver(aw_render_process_observer_.get());
 
   visited_link_slave_.reset(new visitedlink::VisitedLinkSlave);
   thread->AddObserver(visited_link_slave_.get());
 }
 
 bool AwContentRendererClient::HandleNavigation(

[mnaganov (inactive), 2015/06/04 19:09:27]

Hmm. Does it mean we can remove this override, as it now always returns false,
and this is exactly the same as what the Android version of
ContentRendererClient::HandleNavigation does?

[sgurun-gerrit only, 2015/06/05 07:52:49]

I think all the handleNavigation path should be removed.

[gsennton, 2015/06/08 14:07:23]

I have removed the handleNavigation path but there is some stuff left (e.g. in
aw_content_browser_client.cc) that was only used from the handleNavigation path,
should this be cleaned up in this CL or in a follow-up? (This CL is already
touching lots of files...)

     content::RenderFrame* render_frame,
     content::DocumentState* document_state,
     int opener_id,
     blink::WebFrame* frame,
     const blink::WebURLRequest& request,
     blink::WebNavigationType type,
     blink::WebNavigationPolicy default_policy,
     bool is_redirect) {
 
   // Only GETs can be overridden.
@@ skipping 20 matching lines @@
   // For HTTP schemes, only top-level navigations can be overridden. Similarly,
   // WebView Classic lets app override only top level about:blank navigations.
   // So we filter out non-top about:blank navigations here.
   if (frame->parent() &&
       (gurl.SchemeIs(url::kHttpScheme) || gurl.SchemeIs(url::kHttpsScheme) ||
        gurl.SchemeIs(url::kAboutScheme)))
     return false;
 
   // use NavigationInterception throttle to handle the call as that can
   // be deferred until after the java side has been constructed.
-  if (opener_id != MSG_ROUTING_NONE) {
+  return false; // don't call shouldOverrideUrlLoading from this function...
+  /*if (opener_id != MSG_ROUTING_NONE) {
     return false;
   }
 
   bool ignore_navigation = false;
   base::string16 url =  request.url().string();
 
   int render_frame_id = render_frame->GetRoutingID();
   RenderThread::Get()->Send(new AwViewHostMsg_ShouldOverrideUrlLoading(
       render_frame_id, url, &ignore_navigation));
-  return ignore_navigation;
+  return ignore_navigation;*/
 }
 
 void AwContentRendererClient::RenderFrameCreated(
     content::RenderFrame* render_frame) {
   new AwContentSettingsClient(render_frame);
   new PrintRenderFrameObserver(render_frame);
   new AwRenderFrameExt(render_frame);
   new AwMessagePortClient(render_frame);
 
   // TODO(jam): when the frame tree moves into content and parent() works at
@@ skipping 76 matching lines @@
 
 bool AwContentRendererClient::ShouldOverridePageVisibilityState(
     const content::RenderFrame* render_frame,
     blink::WebPageVisibilityState* override_state) {
   // webview is always visible due to rendering requirements.
   *override_state = blink::WebPageVisibilityStateVisible;
   return true;
 }
 
 }  // namespace android_webview