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_browser_permission_request_delegate.h" | 9 #include "android_webview/browser/aw_browser_permission_request_delegate.h" |
10 #include "android_webview/browser/aw_contents_client_bridge_base.h" | 10 #include "android_webview/browser/aw_contents_client_bridge_base.h" |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 host->GetID(), url::kFileScheme); | 228 host->GetID(), url::kFileScheme); |
229 | 229 |
230 host->AddFilter(new AwContentsMessageFilter(host->GetID())); | 230 host->AddFilter(new AwContentsMessageFilter(host->GetID())); |
231 host->AddFilter(new cdm::CdmMessageFilterAndroid()); | 231 host->AddFilter(new cdm::CdmMessageFilterAndroid()); |
232 } | 232 } |
233 | 233 |
234 net::URLRequestContextGetter* AwContentBrowserClient::CreateRequestContext( | 234 net::URLRequestContextGetter* AwContentBrowserClient::CreateRequestContext( |
235 content::BrowserContext* browser_context, | 235 content::BrowserContext* browser_context, |
236 content::ProtocolHandlerMap* protocol_handlers, | 236 content::ProtocolHandlerMap* protocol_handlers, |
237 content::URLRequestInterceptorScopedVector request_interceptors) { | 237 content::URLRequestInterceptorScopedVector request_interceptors) { |
238 DCHECK(browser_context_.get() == browser_context); | 238 DCHECK_EQ(browser_context_.get(), browser_context); |
239 return browser_context_->CreateRequestContext(protocol_handlers, | 239 return browser_context_->CreateRequestContext(protocol_handlers, |
240 request_interceptors.Pass()); | 240 request_interceptors.Pass()); |
241 } | 241 } |
242 | 242 |
243 net::URLRequestContextGetter* | 243 net::URLRequestContextGetter* |
244 AwContentBrowserClient::CreateRequestContextForStoragePartition( | 244 AwContentBrowserClient::CreateRequestContextForStoragePartition( |
245 content::BrowserContext* browser_context, | 245 content::BrowserContext* browser_context, |
246 const base::FilePath& partition_path, | 246 const base::FilePath& partition_path, |
247 bool in_memory, | 247 bool in_memory, |
248 content::ProtocolHandlerMap* protocol_handlers, | 248 content::ProtocolHandlerMap* protocol_handlers, |
249 content::URLRequestInterceptorScopedVector request_interceptors) { | 249 content::URLRequestInterceptorScopedVector request_interceptors) { |
250 DCHECK(browser_context_.get() == browser_context); | 250 DCHECK_EQ(browser_context_.get(), browser_context); |
251 // TODO(mkosiba,kinuko): request_interceptors should be hooked up in the | 251 // TODO(mkosiba,kinuko): request_interceptors should be hooked up in the |
252 // downstream. (crbug.com/350286) | 252 // downstream. (crbug.com/350286) |
253 return browser_context_->CreateRequestContextForStoragePartition( | 253 return browser_context_->CreateRequestContextForStoragePartition( |
254 partition_path, in_memory, protocol_handlers, | 254 partition_path, in_memory, protocol_handlers, |
255 request_interceptors.Pass()); | 255 request_interceptors.Pass()); |
256 } | 256 } |
257 | 257 |
258 std::string AwContentBrowserClient::GetCanonicalEncodingNameByAliasName( | 258 std::string AwContentBrowserClient::GetCanonicalEncodingNameByAliasName( |
259 const std::string& alias_name) { | 259 const std::string& alias_name) { |
260 return alias_name; | 260 return alias_name; |
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
585 | 585 |
586 #if defined(VIDEO_HOLE) | 586 #if defined(VIDEO_HOLE) |
587 content::ExternalVideoSurfaceContainer* | 587 content::ExternalVideoSurfaceContainer* |
588 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 588 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
589 content::WebContents* web_contents) { | 589 content::WebContents* web_contents) { |
590 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); | 590 return native_factory_->CreateExternalVideoSurfaceContainer(web_contents); |
591 } | 591 } |
592 #endif | 592 #endif |
593 | 593 |
594 } // namespace android_webview | 594 } // namespace android_webview |
OLD | NEW |