Upstream ShouldOverrideUrlLoading changes

android_webview/renderer/aw_content_renderer_client.h

Index: android_webview/renderer/aw_content_renderer_client.h
diff --git a/android_webview/renderer/aw_content_renderer_client.h b/android_webview/renderer/aw_content_renderer_client.h
index 71730798da545b22cdce9c0e1b489a0c8f7b5a8f..c0c98c57daf52610b8721301911a3897e46743f4 100644
--- a/android_webview/renderer/aw_content_renderer_client.h
+++ b/android_webview/renderer/aw_content_renderer_client.h
@@ -10,6 +10,10 @@
 #include "android_webview/renderer/aw_render_process_observer.h"
 #include "base/compiler_specific.h"
 
+namespace content {
+class DocumentState;
+class RenderView;
+}

[boliu, 2013/12/06 20:28:23]

This should not be needed since they must be in content_renderer_client.h
already.

[sgurun-gerrit only, 2013/12/07 00:11:07]

Done.

 namespace visitedlink {
 class VisitedLinkSlave;
 }
@@ -40,6 +44,15 @@ class AwContentRendererClient : public content::ContentRendererClient {
   virtual void AddKeySystems(
       std::vector<content::KeySystemInfo>* key_systems) OVERRIDE;
 
+  virtual bool HandleNavigation(content::RenderView* view,
+                                content::DocumentState* document_state,
+                                int opener_id,
+                                blink::WebFrame* frame,
+                                const blink::WebURLRequest& request,
+                                blink::WebNavigationType type,
+                                blink::WebNavigationPolicy default_policy,
+                                bool is_redirect) OVERRIDE;
+
  private:
   scoped_ptr<AwRenderProcessObserver> aw_render_process_observer_;
   scoped_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_;