| 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 <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "android_webview/common/aw_resource.h" | 9 #include "android_webview/common/aw_resource.h" |
| 10 #include "android_webview/common/aw_switches.h" | 10 #include "android_webview/common/aw_switches.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 } | 61 } |
| 62 | 62 |
| 63 void AwContentRendererClient::RenderThreadStarted() { | 63 void AwContentRendererClient::RenderThreadStarted() { |
| 64 RenderThread* thread = RenderThread::Get(); | 64 RenderThread* thread = RenderThread::Get(); |
| 65 aw_render_process_observer_.reset(new AwRenderProcessObserver); | 65 aw_render_process_observer_.reset(new AwRenderProcessObserver); |
| 66 thread->AddObserver(aw_render_process_observer_.get()); | 66 thread->AddObserver(aw_render_process_observer_.get()); |
| 67 | 67 |
| 68 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave); | 68 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave); |
| 69 thread->AddObserver(visited_link_slave_.get()); | 69 thread->AddObserver(visited_link_slave_.get()); |
| 70 | 70 |
| 71 // Using WebString requires blink initialization. | |
| 72 thread->EnsureWebKitInitialized(); | |
| 73 | |
| 74 blink::WebString content_scheme(base::ASCIIToUTF16(url::kContentScheme)); | 71 blink::WebString content_scheme(base::ASCIIToUTF16(url::kContentScheme)); |
| 75 blink::WebSecurityPolicy::registerURLSchemeAsLocal(content_scheme); | 72 blink::WebSecurityPolicy::registerURLSchemeAsLocal(content_scheme); |
| 76 | 73 |
| 77 blink::WebString aw_scheme( | 74 blink::WebString aw_scheme( |
| 78 base::ASCIIToUTF16(android_webview::kAndroidWebViewVideoPosterScheme)); | 75 base::ASCIIToUTF16(android_webview::kAndroidWebViewVideoPosterScheme)); |
| 79 blink::WebSecurityPolicy::registerURLSchemeAsSecure(aw_scheme); | 76 blink::WebSecurityPolicy::registerURLSchemeAsSecure(aw_scheme); |
| 80 } | 77 } |
| 81 | 78 |
| 82 bool AwContentRendererClient::HandleNavigation( | 79 bool AwContentRendererClient::HandleNavigation( |
| 83 content::RenderFrame* render_frame, | 80 content::RenderFrame* render_frame, |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 blink::WebPageVisibilityState* override_state) { | 233 blink::WebPageVisibilityState* override_state) { |
| 237 if (disable_page_visibility_) { | 234 if (disable_page_visibility_) { |
| 238 *override_state = blink::WebPageVisibilityStateVisible; | 235 *override_state = blink::WebPageVisibilityStateVisible; |
| 239 return true; | 236 return true; |
| 240 } | 237 } |
| 241 | 238 |
| 242 return false; | 239 return false; |
| 243 } | 240 } |
| 244 | 241 |
| 245 } // namespace android_webview | 242 } // namespace android_webview |
| OLD | NEW |