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 "content/public/browser/client_certificate_delegate.h" |
8 #include "ui/gfx/image/image_skia.h" | 9 #include "ui/gfx/image/image_skia.h" |
9 #include "url/gurl.h" | 10 #include "url/gurl.h" |
10 | 11 |
11 namespace content { | 12 namespace content { |
12 | 13 |
13 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( | 14 BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts( |
14 const MainFunctionParams& parameters) { | 15 const MainFunctionParams& parameters) { |
15 return nullptr; | 16 return nullptr; |
16 } | 17 } |
17 | 18 |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 ResourceContext* context, | 171 ResourceContext* context, |
171 const std::vector<std::pair<int, int> >& render_frames) { | 172 const std::vector<std::pair<int, int> >& render_frames) { |
172 return true; | 173 return true; |
173 } | 174 } |
174 | 175 |
175 QuotaPermissionContext* ContentBrowserClient::CreateQuotaPermissionContext() { | 176 QuotaPermissionContext* ContentBrowserClient::CreateQuotaPermissionContext() { |
176 return nullptr; | 177 return nullptr; |
177 } | 178 } |
178 | 179 |
179 void ContentBrowserClient::SelectClientCertificate( | 180 void ContentBrowserClient::SelectClientCertificate( |
180 int render_process_id, | 181 WebContents* web_contents, |
181 int render_frame_id, | |
182 net::SSLCertRequestInfo* cert_request_info, | 182 net::SSLCertRequestInfo* cert_request_info, |
183 const base::Callback<void(net::X509Certificate*)>& callback) { | 183 scoped_ptr<ClientCertificateDelegate> delegate) { |
184 callback.Run(nullptr); | 184 delegate->CancelCertificateSelection(); |
185 } | 185 } |
186 | 186 |
187 net::URLRequestContext* ContentBrowserClient::OverrideRequestContextForURL( | 187 net::URLRequestContext* ContentBrowserClient::OverrideRequestContextForURL( |
188 const GURL& url, ResourceContext* context) { | 188 const GURL& url, ResourceContext* context) { |
189 return nullptr; | 189 return nullptr; |
190 } | 190 } |
191 | 191 |
192 std::string ContentBrowserClient::GetStoragePartitionIdForSite( | 192 std::string ContentBrowserClient::GetStoragePartitionIdForSite( |
193 BrowserContext* browser_context, | 193 BrowserContext* browser_context, |
194 const GURL& site) { | 194 const GURL& site) { |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 | 350 |
351 #if defined(VIDEO_HOLE) | 351 #if defined(VIDEO_HOLE) |
352 ExternalVideoSurfaceContainer* | 352 ExternalVideoSurfaceContainer* |
353 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 353 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
354 WebContents* web_contents) { | 354 WebContents* web_contents) { |
355 return nullptr; | 355 return nullptr; |
356 } | 356 } |
357 #endif | 357 #endif |
358 | 358 |
359 } // namespace content | 359 } // namespace content |
OLD | NEW |