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/browser/aw_content_browser_client.h" | 5 #include "android_webview/browser/aw_content_browser_client.h" |
6 | 6 |
7 #include "android_webview/browser/aw_browser_context.h" | 7 #include "android_webview/browser/aw_browser_context.h" |
8 #include "android_webview/browser/aw_browser_main_parts.h" | 8 #include "android_webview/browser/aw_browser_main_parts.h" |
9 #include "android_webview/browser/aw_contents_client_bridge_base.h" | 9 #include "android_webview/browser/aw_contents_client_bridge_base.h" |
10 #include "android_webview/browser/aw_contents_io_thread_client.h" | 10 #include "android_webview/browser/aw_contents_io_thread_client.h" |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 // deferring the GrantScheme calls until we know that a given child process | 196 // deferring the GrantScheme calls until we know that a given child process |
197 // really does need that priviledge. Check here to ensure we rethink this | 197 // really does need that priviledge. Check here to ensure we rethink this |
198 // when the time comes. See crbug.com/156062. | 198 // when the time comes. See crbug.com/156062. |
199 CHECK(content::RenderProcessHost::run_renderer_in_process()); | 199 CHECK(content::RenderProcessHost::run_renderer_in_process()); |
200 | 200 |
201 // Grant content: and file: scheme to the whole process, since we impose | 201 // Grant content: and file: scheme to the whole process, since we impose |
202 // per-view access checks. | 202 // per-view access checks. |
203 content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme( | 203 content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme( |
204 host->GetID(), android_webview::kContentScheme); | 204 host->GetID(), android_webview::kContentScheme); |
205 content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme( | 205 content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme( |
206 host->GetID(), content::kFileScheme); | 206 host->GetID(), url::kFileScheme); |
207 | 207 |
208 host->AddFilter(new AwContentsMessageFilter(host->GetID())); | 208 host->AddFilter(new AwContentsMessageFilter(host->GetID())); |
209 host->AddFilter(new cdm::CdmMessageFilterAndroid()); | 209 host->AddFilter(new cdm::CdmMessageFilterAndroid()); |
210 } | 210 } |
211 | 211 |
212 net::URLRequestContextGetter* AwContentBrowserClient::CreateRequestContext( | 212 net::URLRequestContextGetter* AwContentBrowserClient::CreateRequestContext( |
213 content::BrowserContext* browser_context, | 213 content::BrowserContext* browser_context, |
214 content::ProtocolHandlerMap* protocol_handlers, | 214 content::ProtocolHandlerMap* protocol_handlers, |
215 content::ProtocolHandlerScopedVector protocol_interceptors) { | 215 content::ProtocolHandlerScopedVector protocol_interceptors) { |
216 DCHECK(browser_context_.get() == browser_context); | 216 DCHECK(browser_context_.get() == browser_context); |
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
498 | 498 |
499 #if defined(VIDEO_HOLE) | 499 #if defined(VIDEO_HOLE) |
500 content::ExternalVideoSurfaceContainer* | 500 content::ExternalVideoSurfaceContainer* |
501 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 501 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
502 content::WebContents* web_contents) { | 502 content::WebContents* web_contents) { |
503 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); | 503 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); |
504 } | 504 } |
505 #endif | 505 #endif |
506 | 506 |
507 } // namespace android_webview | 507 } // namespace android_webview |
OLD | NEW |