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_rv.h" |
10 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
11 #include "content/public/renderer/render_thread.h" | 12 #include "content/public/renderer/render_thread.h" |
12 #include "googleurl/src/gurl.h" | 13 #include "googleurl/src/gurl.h" |
13 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" | 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" |
14 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" | 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" |
15 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" | 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" |
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" | 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" |
17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" | 18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" |
18 | 19 |
19 namespace android_webview { | 20 namespace android_webview { |
(...skipping 10 matching lines...) Expand all Loading... |
30 WebKit::WebSecurityPolicy::registerURLSchemeAsLocal(content_scheme); | 31 WebKit::WebSecurityPolicy::registerURLSchemeAsLocal(content_scheme); |
31 | 32 |
32 aw_render_process_observer_.reset(new AwRenderProcessObserver); | 33 aw_render_process_observer_.reset(new AwRenderProcessObserver); |
33 content::RenderThread::Get()->AddObserver( | 34 content::RenderThread::Get()->AddObserver( |
34 aw_render_process_observer_.get()); | 35 aw_render_process_observer_.get()); |
35 } | 36 } |
36 | 37 |
37 void AwContentRendererClient::RenderViewCreated( | 38 void AwContentRendererClient::RenderViewCreated( |
38 content::RenderView* render_view) { | 39 content::RenderView* render_view) { |
39 AwRenderViewExt::RenderViewCreated(render_view); | 40 AwRenderViewExt::RenderViewCreated(render_view); |
| 41 ViewRendererRV::RenderViewCreated(render_view); |
40 } | 42 } |
41 | 43 |
42 std::string AwContentRendererClient::GetDefaultEncoding() { | 44 std::string AwContentRendererClient::GetDefaultEncoding() { |
43 return AwResource::GetDefaultTextEncoding(); | 45 return AwResource::GetDefaultTextEncoding(); |
44 } | 46 } |
45 | 47 |
46 bool AwContentRendererClient::HasErrorPage(int http_status_code, | 48 bool AwContentRendererClient::HasErrorPage(int http_status_code, |
47 std::string* error_domain) { | 49 std::string* error_domain) { |
48 return http_status_code >= 400; | 50 return http_status_code >= 400; |
49 } | 51 } |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 return false; | 86 return false; |
85 } | 87 } |
86 | 88 |
87 void AwContentRendererClient::PrefetchHostName(const char* hostname, | 89 void AwContentRendererClient::PrefetchHostName(const char* hostname, |
88 size_t length) { | 90 size_t length) { |
89 // TODO(boliu): Implement hostname prefetch for Android WebView. | 91 // TODO(boliu): Implement hostname prefetch for Android WebView. |
90 // Perhaps componentize chrome implementation or move to content/? | 92 // Perhaps componentize chrome implementation or move to content/? |
91 } | 93 } |
92 | 94 |
93 } // namespace android_webview | 95 } // namespace android_webview |
OLD | NEW |