Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Side by Side Diff: content/public/browser/content_browser_client.h

Issue 873723003: Follow-up changes to https://codereview.chromium.org/795773002/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/ssl/ssl_client_auth_handler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 const net::SSLInfo& ssl_info, 388 const net::SSLInfo& ssl_info,
389 const GURL& request_url, 389 const GURL& request_url,
390 ResourceType resource_type, 390 ResourceType resource_type,
391 bool overridable, 391 bool overridable,
392 bool strict_enforcement, 392 bool strict_enforcement,
393 bool expired_previous_decision, 393 bool expired_previous_decision,
394 const base::Callback<void(bool)>& callback, 394 const base::Callback<void(bool)>& callback,
395 CertificateRequestResultType* result) {} 395 CertificateRequestResultType* result) {}
396 396
397 // Selects a SSL client certificate and returns it to the |callback|. If no 397 // Selects a SSL client certificate and returns it to the |callback|. If no
398 // certificate was selected nullptr is returned to the |callback|. 398 // certificate was selected nullptr is returned to the |callback|. Note:
399 // |callback| may be called synchronously or asynchronously.
399 virtual void SelectClientCertificate( 400 virtual void SelectClientCertificate(
400 int render_process_id, 401 int render_process_id,
401 int render_frame_id, 402 int render_frame_id,
402 net::SSLCertRequestInfo* cert_request_info, 403 net::SSLCertRequestInfo* cert_request_info,
403 const base::Callback<void(net::X509Certificate*)>& callback); 404 const base::Callback<void(net::X509Certificate*)>& callback);
404 405
405 // Adds a new installable certificate or private key. 406 // Adds a new installable certificate or private key.
406 // Typically used to install an X.509 user certificate. 407 // Typically used to install an X.509 user certificate.
407 // Note that it's up to the embedder to verify that the data is 408 // Note that it's up to the embedder to verify that the data is
408 // well-formed. |cert_data| will be nullptr if |cert_size| is 0. 409 // well-formed. |cert_data| will be nullptr if |cert_size| is 0.
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 // Allows an embedder to provide its own ExternalVideoSurfaceContainer 613 // Allows an embedder to provide its own ExternalVideoSurfaceContainer
613 // implementation. Return nullptr to disable external surface video. 614 // implementation. Return nullptr to disable external surface video.
614 virtual ExternalVideoSurfaceContainer* 615 virtual ExternalVideoSurfaceContainer*
615 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents); 616 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents);
616 #endif 617 #endif
617 }; 618 };
618 619
619 } // namespace content 620 } // namespace content
620 621
621 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 622 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/browser/ssl/ssl_client_auth_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698