chrome/browser/chrome_content_browser_client.h - Issue 11266008: Fix certificate and keychain installation on Android.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chrome_content_browser_client.h

Issue 11266008: Fix certificate and keychain installation on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: move some code to chrome/browser/ssl/ Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/chrome_content_browser_client.h

diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h

index 0b9e438aa079f37e031c73305bbab145d8fed061..36a3d79f85726a1260bd9f7cc9d35c4c4a973104 100644

--- a/chrome/browser/chrome_content_browser_client.h

+++ b/chrome/browser/chrome_content_browser_client.h

@@ -154,9 +154,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {

const net::HttpNetworkSession* network_session,

net::SSLCertRequestInfo* cert_request_info,

const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;

- virtual void AddNewCertificate(

+ virtual void AddCertificate(

net::URLRequest* request,

- net::X509Certificate* cert,

+ net::CertificateType cert_type,

+ const void* cert_data,

+ size_t cert_size,

int render_process_id,

int render_view_id) OVERRIDE;

virtual content::MediaObserver* GetMediaObserver() OVERRIDE;