| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "android_webview/renderer/aw_content_renderer_client.h" | 5 #include "android_webview/renderer/aw_content_renderer_client.h" |
| 6 | 6 |
| 7 #include "android_webview/common/aw_resource.h" | 7 #include "android_webview/common/aw_resource.h" |
| 8 #include "android_webview/common/render_view_messages.h" | 8 #include "android_webview/common/render_view_messages.h" |
| 9 #include "android_webview/common/url_constants.h" | 9 #include "android_webview/common/url_constants.h" |
| 10 #include "android_webview/renderer/aw_content_settings_client.h" | 10 #include "android_webview/renderer/aw_content_settings_client.h" |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 return false; | 105 return false; |
| 106 | 106 |
| 107 // use NavigationInterception throttle to handle the call as that can | 107 // use NavigationInterception throttle to handle the call as that can |
| 108 // be deferred until after the java side has been constructed. | 108 // be deferred until after the java side has been constructed. |
| 109 if (opener_id != MSG_ROUTING_NONE) { | 109 if (opener_id != MSG_ROUTING_NONE) { |
| 110 return false; | 110 return false; |
| 111 } | 111 } |
| 112 | 112 |
| 113 bool ignore_navigation = false; | 113 bool ignore_navigation = false; |
| 114 base::string16 url = request.url().string(); | 114 base::string16 url = request.url().string(); |
| 115 bool has_user_gesture = request.hasUserGesture(); |
| 115 | 116 |
| 116 int render_frame_id = render_frame->GetRoutingID(); | 117 int render_frame_id = render_frame->GetRoutingID(); |
| 117 RenderThread::Get()->Send(new AwViewHostMsg_ShouldOverrideUrlLoading( | 118 RenderThread::Get()->Send(new AwViewHostMsg_ShouldOverrideUrlLoading( |
| 118 render_frame_id, url, &ignore_navigation)); | 119 render_frame_id, url, has_user_gesture, is_redirect, &ignore_navigation)); |
| 119 return ignore_navigation; | 120 return ignore_navigation; |
| 120 } | 121 } |
| 121 | 122 |
| 122 void AwContentRendererClient::RenderFrameCreated( | 123 void AwContentRendererClient::RenderFrameCreated( |
| 123 content::RenderFrame* render_frame) { | 124 content::RenderFrame* render_frame) { |
| 124 new AwContentSettingsClient(render_frame); | 125 new AwContentSettingsClient(render_frame); |
| 125 new PrintRenderFrameObserver(render_frame); | 126 new PrintRenderFrameObserver(render_frame); |
| 126 new AwRenderFrameExt(render_frame); | 127 new AwRenderFrameExt(render_frame); |
| 127 new AwMessagePortClient(render_frame); | 128 new AwMessagePortClient(render_frame); |
| 128 | 129 |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 | 207 |
| 207 bool AwContentRendererClient::ShouldOverridePageVisibilityState( | 208 bool AwContentRendererClient::ShouldOverridePageVisibilityState( |
| 208 const content::RenderFrame* render_frame, | 209 const content::RenderFrame* render_frame, |
| 209 blink::WebPageVisibilityState* override_state) { | 210 blink::WebPageVisibilityState* override_state) { |
| 210 // webview is always visible due to rendering requirements. | 211 // webview is always visible due to rendering requirements. |
| 211 *override_state = blink::WebPageVisibilityStateVisible; | 212 *override_state = blink::WebPageVisibilityStateVisible; |
| 212 return true; | 213 return true; |
| 213 } | 214 } |
| 214 | 215 |
| 215 } // namespace android_webview | 216 } // namespace android_webview |
| OLD | NEW |