| Index: android_webview/renderer/aw_content_renderer_client.cc
|
| diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc
|
| index 783590100fc661a816e44a184df8f60acfe5a339..19bddc285e9cc2ad8064f97ff2bf7e194bc76b8b 100644
|
| --- a/android_webview/renderer/aw_content_renderer_client.cc
|
| +++ b/android_webview/renderer/aw_content_renderer_client.cc
|
| @@ -47,7 +47,6 @@
|
| #include "third_party/WebKit/public/platform/WebURLError.h"
|
| #include "third_party/WebKit/public/platform/WebURLRequest.h"
|
| #include "third_party/WebKit/public/web/WebFrame.h"
|
| -#include "third_party/WebKit/public/web/WebNavigationType.h"
|
| #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| @@ -90,7 +89,7 @@ bool AwContentRendererClient::HandleNavigation(
|
| bool render_view_was_created_by_renderer,
|
| blink::WebFrame* frame,
|
| const blink::WebURLRequest& request,
|
| - blink::WebNavigationType type,
|
| + bool is_back_forward,
|
| blink::WebNavigationPolicy default_policy,
|
| bool is_redirect) {
|
| // Only GETs can be overridden.
|
| @@ -105,8 +104,7 @@ bool AwContentRendererClient::HandleNavigation(
|
| // navigations but since android_webview does not swap out renderers, this
|
| // works fine. This will stop working if android_webview starts swapping out
|
| // renderers on navigation.
|
| - bool application_initiated =
|
| - !is_content_initiated || type == blink::WebNavigationTypeBackForward;
|
| + bool application_initiated = !is_content_initiated || is_back_forward;
|
|
|
| // Don't offer application-initiated navigations unless it's a redirect.
|
| if (application_initiated && !is_redirect)
|
|
|