chrome/browser/chrome_content_browser_client.cc - Issue 10946011: Switch CaptivePortalTabHelper to use WebContentsUserData.

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 10946011: Switch CaptivePortalTabHelper to use WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 3 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:

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 8ee9c701f71e70034d903ec7223fb64224d8c7fc..cc141fd5be0cc7fffcf43972583a011c60edcfb2 100644

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

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

@@ -1186,9 +1186,10 @@ void ChromeContentBrowserClient::AllowCertificateError(

}

#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)

- TabContents* tab_contents = TabContents::FromWebContents(tab);

- if (tab_contents)

- tab_contents->captive_portal_tab_helper()->OnSSLCertError(ssl_info);

+ captive_portal::CaptivePortalTabHelper* captive_portal_tab_helper =

+ captive_portal::CaptivePortalTabHelper::FromWebContents(tab);

+ if (captive_portal_tab_helper)

+ captive_portal_tab_helper->OnSSLCertError(ssl_info);

#endif

// Otherwise, display an SSL blocking page.