Upstream ShouldOverrideUrlLoading changes

android_webview/browser/renderer_host/aw_render_view_host_ext.h

 // Copyright (c) 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.
 
 #ifndef ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_
 #define ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_
 
 #include "content/public/browser/web_contents_observer.h"
 
 #include "android_webview/common/aw_hit_test_data.h"
@@ skipping 10 matching lines @@
 }  // namespace content
 
 namespace android_webview {
 
 class AwRenderViewHostExtClient {
  public:
   // Called when the RenderView page scale changes.
   virtual void OnWebLayoutPageScaleFactorChanged(float page_scale_factor) = 0;
   virtual void OnWebLayoutContentsSizeChanged(
       const gfx::Size& contents_size) = 0;
+  // Called when there is a top level navigation.
+  virtual bool OnShouldOverrideUrlLoading(const base::string16& url) = 0;
 
  protected:
   virtual ~AwRenderViewHostExtClient() {}
 };
 
 // Provides RenderViewHost wrapper functionality for sending WebView-specific
 // IPC messages to the renderer and from there to WebKit.
 class AwRenderViewHostExt : public content::WebContentsObserver,
                             public base::NonThreadSafe {
  public:
@@ skipping 44 matching lines @@
   virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
   virtual void DidNavigateAnyFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   void OnDocumentHasImagesResponse(int msg_id, bool has_images);
   void OnUpdateHitTestData(const AwHitTestData& hit_test_data);
   void OnPageScaleFactorChanged(float page_scale_factor);
   void OnContentsSizeChanged(const gfx::Size& contents_size);
+  void OnShouldOverrideUrlLoading(const base::string16& url,
+                                  bool* ignore_navigation);
 
   bool IsRenderViewReady() const;
 
   AwRenderViewHostExtClient* client_;
 
   SkColor background_color_;
 
   std::map<int, DocumentHasImagesResult> pending_document_has_images_requests_;
 
   // Master copy of hit test data on the browser side. This is updated
   // as a result of DoHitTest called explicitly or when the FocusedNodeChanged
   // is called in AwRenderViewExt.
   AwHitTestData last_hit_test_data_;
 
   bool has_new_hit_test_data_;
 
   DISALLOW_COPY_AND_ASSIGN(AwRenderViewHostExt);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_