chrome/browser/chrome_content_browser_client.cc - Issue 935663004: Add checkbox for reporting invalid TLS/SSL cert chains

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.cc

Issue 935663004: Add checkbox for reporting invalid TLS/SSL cert chains (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: set callback to DoNothing close to where it's used Created 5 years, 9 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/chrome_content_browser_client.h ('K') | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/interstitials/security_interstitial_page.h » ('j') | chrome/browser/interstitials/security_interstitial_page.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_content_browser_client.cc

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

index c01470d5715827bfb50a0b7e9ebaea960bff36d8..23f5819d06c1dfe114b2de13661fb809e1bfe3a2 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -41,6 +41,7 @@

#include "chrome/browser/media/midi_permission_context_factory.h"

#include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h"

#include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"

+#include "chrome/browser/net/certificate_error_reporter.h"

#include "chrome/browser/net/chrome_net_log.h"

#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"

#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h"

@@ -137,6 +138,7 @@

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/resources/grit/ui_resources.h"

+#include "url/gurl.h"

#if defined(OS_WIN)

#include "base/win/windows_version.h"

@@ -698,6 +700,9 @@ ChromeContentBrowserClient::ChromeContentBrowserClient()

v8_natives_fd_(-1),

v8_snapshot_fd_(-1),

#endif // OS_POSIX && !OS_MACOSX

+ certificate_error_reporter_(

+ new chrome_browser_net::CertificateErrorReporter(

+ GURL(chrome_browser_net::kExtendedReportingUploadUrl))),

weak_factory_(this) {

#if defined(ENABLE_PLUGINS)

for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i)

@@ -1847,8 +1852,9 @@ void ChromeContentBrowserClient::AllowCertificateError(

if (expired_previous_decision)

options_mask |= SSLBlockingPage::EXPIRED_BUT_PREVIOUSLY_ALLOWED;

- SSLErrorHandler::HandleSSLError(

- tab, cert_error, ssl_info, request_url, options_mask, callback);

+ SSLErrorHandler::HandleSSLError(tab, cert_error, ssl_info, request_url,

Ryan Sleevi 2015/03/14 03:09:42 I suspect that in HandleSSLError, it would grab th

+ options_mask, certificate_error_reporter_,

+ callback);

}

void ChromeContentBrowserClient::SelectClientCertificate(