Upstream ShouldOverrideUrlLoading changes

android_webview/browser/renderer_host/aw_render_view_host_ext.cc

 // 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.
 
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/common/render_view_messages.h"
@@ skipping 123 matching lines @@
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(AwRenderViewHostExt, message)
     IPC_MESSAGE_HANDLER(AwViewHostMsg_DocumentHasImagesResponse,
                         OnDocumentHasImagesResponse)
     IPC_MESSAGE_HANDLER(AwViewHostMsg_UpdateHitTestData,
                         OnUpdateHitTestData)
     IPC_MESSAGE_HANDLER(AwViewHostMsg_PageScaleFactorChanged,
                         OnPageScaleFactorChanged)
     IPC_MESSAGE_HANDLER(AwViewHostMsg_OnContentsSizeChanged,
                         OnContentsSizeChanged)
+    IPC_MESSAGE_HANDLER(AwViewHostMsg_ShouldOverrideUrlLoading,
+                        OnShouldOverrideUrlLoading)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled ? true : WebContentsObserver::OnMessageReceived(message);
 }
 
 void AwRenderViewHostExt::OnDocumentHasImagesResponse(int msg_id,
                                                       bool has_images) {
   DCHECK(CalledOnValidThread());
   std::map<int, DocumentHasImagesResult>::iterator pending_req =
@@ skipping 15 matching lines @@
 
 void AwRenderViewHostExt::OnPageScaleFactorChanged(float page_scale_factor) {
   client_->OnWebLayoutPageScaleFactorChanged(page_scale_factor);
 }
 
 void AwRenderViewHostExt::OnContentsSizeChanged(
     const gfx::Size& contents_size) {
   client_->OnWebLayoutContentsSizeChanged(contents_size);
 }
 
+void AwRenderViewHostExt::OnShouldOverrideUrlLoading(const base::string16& url,
+                                                     bool* ignore_navigation) {
+
+  *ignore_navigation = client_->OnShouldOverrideUrlLoading(url);
+}
+
 }  // namespace android_webview