OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/url_constants.h" | 8 #include "android_webview/common/url_constants.h" |
9 #include "android_webview/renderer/aw_render_view_ext.h" | 9 #include "android_webview/renderer/aw_render_view_ext.h" |
| 10 #include "android_webview/renderer/view_renderer.h" |
10 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
11 #include "components/visitedlink/renderer/visitedlink_slave.h" | 12 #include "components/visitedlink/renderer/visitedlink_slave.h" |
12 #include "content/public/renderer/render_thread.h" | 13 #include "content/public/renderer/render_thread.h" |
13 #include "googleurl/src/gurl.h" | 14 #include "googleurl/src/gurl.h" |
14 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" | 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" |
15 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" | 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" |
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" | 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" |
17 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" | 18 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" |
18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" | 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" |
19 | 20 |
(...skipping 15 matching lines...) Expand all Loading... |
35 aw_render_process_observer_.reset(new AwRenderProcessObserver); | 36 aw_render_process_observer_.reset(new AwRenderProcessObserver); |
36 thread->AddObserver(aw_render_process_observer_.get()); | 37 thread->AddObserver(aw_render_process_observer_.get()); |
37 | 38 |
38 visited_link_slave_.reset(new components::VisitedLinkSlave); | 39 visited_link_slave_.reset(new components::VisitedLinkSlave); |
39 thread->AddObserver(visited_link_slave_.get()); | 40 thread->AddObserver(visited_link_slave_.get()); |
40 } | 41 } |
41 | 42 |
42 void AwContentRendererClient::RenderViewCreated( | 43 void AwContentRendererClient::RenderViewCreated( |
43 content::RenderView* render_view) { | 44 content::RenderView* render_view) { |
44 AwRenderViewExt::RenderViewCreated(render_view); | 45 AwRenderViewExt::RenderViewCreated(render_view); |
| 46 ViewRenderer::RenderViewCreated(render_view); |
45 } | 47 } |
46 | 48 |
47 std::string AwContentRendererClient::GetDefaultEncoding() { | 49 std::string AwContentRendererClient::GetDefaultEncoding() { |
48 return AwResource::GetDefaultTextEncoding(); | 50 return AwResource::GetDefaultTextEncoding(); |
49 } | 51 } |
50 | 52 |
51 bool AwContentRendererClient::HasErrorPage(int http_status_code, | 53 bool AwContentRendererClient::HasErrorPage(int http_status_code, |
52 std::string* error_domain) { | 54 std::string* error_domain) { |
53 return http_status_code >= 400; | 55 return http_status_code >= 400; |
54 } | 56 } |
(...skipping 30 matching lines...) Expand all Loading... |
85 return visited_link_slave_->IsVisited(link_hash); | 87 return visited_link_slave_->IsVisited(link_hash); |
86 } | 88 } |
87 | 89 |
88 void AwContentRendererClient::PrefetchHostName(const char* hostname, | 90 void AwContentRendererClient::PrefetchHostName(const char* hostname, |
89 size_t length) { | 91 size_t length) { |
90 // TODO(boliu): Implement hostname prefetch for Android WebView. | 92 // TODO(boliu): Implement hostname prefetch for Android WebView. |
91 // Perhaps componentize chrome implementation or move to content/? | 93 // Perhaps componentize chrome implementation or move to content/? |
92 } | 94 } |
93 | 95 |
94 } // namespace android_webview | 96 } // namespace android_webview |
OLD | NEW |