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_key_systems.h" | 10 #include "android_webview/renderer/aw_key_systems.h" |
11 #include "android_webview/renderer/aw_permission_client.h" | 11 #include "android_webview/renderer/aw_permission_client.h" |
| 12 #include "android_webview/renderer/aw_render_frame_observer.h" |
12 #include "android_webview/renderer/aw_render_view_ext.h" | 13 #include "android_webview/renderer/aw_render_view_ext.h" |
13 #include "android_webview/renderer/print_web_view_helper.h" | 14 #include "android_webview/renderer/print_web_view_helper.h" |
14 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
15 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
16 #include "components/autofill/content/renderer/autofill_agent.h" | 17 #include "components/autofill/content/renderer/autofill_agent.h" |
17 #include "components/autofill/content/renderer/password_autofill_agent.h" | 18 #include "components/autofill/content/renderer/password_autofill_agent.h" |
18 #include "components/visitedlink/renderer/visitedlink_slave.h" | 19 #include "components/visitedlink/renderer/visitedlink_slave.h" |
19 #include "content/public/common/url_constants.h" | 20 #include "content/public/common/url_constants.h" |
20 #include "content/public/renderer/document_state.h" | 21 #include "content/public/renderer/document_state.h" |
21 #include "content/public/renderer/navigation_state.h" | 22 #include "content/public/renderer/navigation_state.h" |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 | 112 |
112 int render_frame_id = render_frame->GetRoutingID(); | 113 int render_frame_id = render_frame->GetRoutingID(); |
113 RenderThread::Get()->Send(new AwViewHostMsg_ShouldOverrideUrlLoading( | 114 RenderThread::Get()->Send(new AwViewHostMsg_ShouldOverrideUrlLoading( |
114 render_frame_id, url, &ignore_navigation)); | 115 render_frame_id, url, &ignore_navigation)); |
115 return ignore_navigation; | 116 return ignore_navigation; |
116 } | 117 } |
117 | 118 |
118 void AwContentRendererClient::RenderFrameCreated( | 119 void AwContentRendererClient::RenderFrameCreated( |
119 content::RenderFrame* render_frame) { | 120 content::RenderFrame* render_frame) { |
120 new AwPermissionClient(render_frame); | 121 new AwPermissionClient(render_frame); |
| 122 new AwRenderFrameObserver(render_frame); |
121 | 123 |
122 // TODO(jam): when the frame tree moves into content and parent() works at | 124 // TODO(jam): when the frame tree moves into content and parent() works at |
123 // RenderFrame construction, simplify this by just checking parent(). | 125 // RenderFrame construction, simplify this by just checking parent(). |
124 content::RenderFrame* parent_frame = | 126 content::RenderFrame* parent_frame = |
125 render_frame->GetRenderView()->GetMainRenderFrame(); | 127 render_frame->GetRenderView()->GetMainRenderFrame(); |
126 if (parent_frame && parent_frame != render_frame) { | 128 if (parent_frame && parent_frame != render_frame) { |
127 // Avoid any race conditions from having the browser's UI thread tell the IO | 129 // Avoid any race conditions from having the browser's UI thread tell the IO |
128 // thread that a subframe was created. | 130 // thread that a subframe was created. |
129 RenderThread::Get()->Send(new AwViewHostMsg_SubFrameCreated( | 131 RenderThread::Get()->Send(new AwViewHostMsg_SubFrameCreated( |
130 parent_frame->GetRoutingID(), render_frame->GetRoutingID())); | 132 parent_frame->GetRoutingID(), render_frame->GetRoutingID())); |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 bool AwContentRendererClient::IsLinkVisited(unsigned long long link_hash) { | 193 bool AwContentRendererClient::IsLinkVisited(unsigned long long link_hash) { |
192 return visited_link_slave_->IsVisited(link_hash); | 194 return visited_link_slave_->IsVisited(link_hash); |
193 } | 195 } |
194 | 196 |
195 void AwContentRendererClient::AddKeySystems( | 197 void AwContentRendererClient::AddKeySystems( |
196 std::vector<content::KeySystemInfo>* key_systems) { | 198 std::vector<content::KeySystemInfo>* key_systems) { |
197 AwAddKeySystems(key_systems); | 199 AwAddKeySystems(key_systems); |
198 } | 200 } |
199 | 201 |
200 } // namespace android_webview | 202 } // namespace android_webview |
OLD | NEW |