| 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 "content/public/browser/content_browser_client.h" | 5 #include "content/public/browser/content_browser_client.h" |
| 6 | 6 |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "content/public/browser/client_certificate_delegate.h" | 9 #include "content/public/browser/client_certificate_delegate.h" |
| 10 #include "content/public/common/sandbox_type.h" | 10 #include "content/public/common/sandbox_type.h" |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 return false; | 95 return false; |
| 96 } | 96 } |
| 97 | 97 |
| 98 bool ContentBrowserClient::ShouldSwapBrowsingInstancesForNavigation( | 98 bool ContentBrowserClient::ShouldSwapBrowsingInstancesForNavigation( |
| 99 SiteInstance* site_instance, | 99 SiteInstance* site_instance, |
| 100 const GURL& current_url, | 100 const GURL& current_url, |
| 101 const GURL& new_url) { | 101 const GURL& new_url) { |
| 102 return false; | 102 return false; |
| 103 } | 103 } |
| 104 | 104 |
| 105 scoped_ptr<media::CdmFactory> ContentBrowserClient::CreateCdmFactory() { | 105 std::unique_ptr<media::CdmFactory> ContentBrowserClient::CreateCdmFactory() { |
| 106 return nullptr; | 106 return nullptr; |
| 107 } | 107 } |
| 108 | 108 |
| 109 bool ContentBrowserClient::ShouldSwapProcessesForRedirect( | 109 bool ContentBrowserClient::ShouldSwapProcessesForRedirect( |
| 110 ResourceContext* resource_context, const GURL& current_url, | 110 ResourceContext* resource_context, const GURL& current_url, |
| 111 const GURL& new_url) { | 111 const GURL& new_url) { |
| 112 return false; | 112 return false; |
| 113 } | 113 } |
| 114 | 114 |
| 115 bool ContentBrowserClient::ShouldAssignSiteForURL(const GURL& url) { | 115 bool ContentBrowserClient::ShouldAssignSiteForURL(const GURL& url) { |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 } | 213 } |
| 214 | 214 |
| 215 std::string ContentBrowserClient::GetWebBluetoothBlacklist() { | 215 std::string ContentBrowserClient::GetWebBluetoothBlacklist() { |
| 216 return std::string(); | 216 return std::string(); |
| 217 } | 217 } |
| 218 | 218 |
| 219 QuotaPermissionContext* ContentBrowserClient::CreateQuotaPermissionContext() { | 219 QuotaPermissionContext* ContentBrowserClient::CreateQuotaPermissionContext() { |
| 220 return nullptr; | 220 return nullptr; |
| 221 } | 221 } |
| 222 | 222 |
| 223 scoped_ptr<storage::QuotaEvictionPolicy> | 223 std::unique_ptr<storage::QuotaEvictionPolicy> |
| 224 ContentBrowserClient::GetTemporaryStorageEvictionPolicy( | 224 ContentBrowserClient::GetTemporaryStorageEvictionPolicy( |
| 225 content::BrowserContext* context) { | 225 content::BrowserContext* context) { |
| 226 return scoped_ptr<storage::QuotaEvictionPolicy>(); | 226 return std::unique_ptr<storage::QuotaEvictionPolicy>(); |
| 227 } | 227 } |
| 228 | 228 |
| 229 void ContentBrowserClient::SelectClientCertificate( | 229 void ContentBrowserClient::SelectClientCertificate( |
| 230 WebContents* web_contents, | 230 WebContents* web_contents, |
| 231 net::SSLCertRequestInfo* cert_request_info, | 231 net::SSLCertRequestInfo* cert_request_info, |
| 232 scoped_ptr<ClientCertificateDelegate> delegate) { | 232 std::unique_ptr<ClientCertificateDelegate> delegate) {} |
| 233 } | |
| 234 | 233 |
| 235 net::URLRequestContext* ContentBrowserClient::OverrideRequestContextForURL( | 234 net::URLRequestContext* ContentBrowserClient::OverrideRequestContextForURL( |
| 236 const GURL& url, ResourceContext* context) { | 235 const GURL& url, ResourceContext* context) { |
| 237 return nullptr; | 236 return nullptr; |
| 238 } | 237 } |
| 239 | 238 |
| 240 std::string ContentBrowserClient::GetStoragePartitionIdForSite( | 239 std::string ContentBrowserClient::GetStoragePartitionIdForSite( |
| 241 BrowserContext* browser_context, | 240 BrowserContext* browser_context, |
| 242 const GURL& site) { | 241 const GURL& site) { |
| 243 return std::string(); | 242 return std::string(); |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 #if defined(VIDEO_HOLE) | 415 #if defined(VIDEO_HOLE) |
| 417 ExternalVideoSurfaceContainer* | 416 ExternalVideoSurfaceContainer* |
| 418 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 417 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
| 419 WebContents* web_contents) { | 418 WebContents* web_contents) { |
| 420 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348."; | 419 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348."; |
| 421 return nullptr; | 420 return nullptr; |
| 422 } | 421 } |
| 423 #endif | 422 #endif |
| 424 | 423 |
| 425 } // namespace content | 424 } // namespace content |
| OLD | NEW |