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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 368143002: Add a chrome://interstitials page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: felt comments Created 6 years, 5 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 | Annotate | Revision Log
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 #include "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1987 matching lines...) Expand 10 before | Expand all | Expand 10 after
1998 } 1998 }
1999 1999
2000 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 2000 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
2001 CaptivePortalTabHelper* captive_portal_tab_helper = 2001 CaptivePortalTabHelper* captive_portal_tab_helper =
2002 CaptivePortalTabHelper::FromWebContents(tab); 2002 CaptivePortalTabHelper::FromWebContents(tab);
2003 if (captive_portal_tab_helper) 2003 if (captive_portal_tab_helper)
2004 captive_portal_tab_helper->OnSSLCertError(ssl_info); 2004 captive_portal_tab_helper->OnSSLCertError(ssl_info);
2005 #endif 2005 #endif
2006 2006
2007 // Otherwise, display an SSL blocking page. 2007 // Otherwise, display an SSL blocking page.
2008 new SSLBlockingPage(tab, cert_error, ssl_info, request_url, overridable, 2008 new SSLBlockingPage(tab, true, cert_error, ssl_info, request_url, overridable,
Bernhard Bauer 2014/07/16 10:22:45 Would it make sense to make this a method ShowSSLB
meacer 2014/07/16 21:21:39 Added Show and CreateForWebUI static methods to SS
2009 strict_enforcement, callback); 2009 strict_enforcement, callback);
2010 } 2010 }
2011 2011
2012 void ChromeContentBrowserClient::SelectClientCertificate( 2012 void ChromeContentBrowserClient::SelectClientCertificate(
2013 int render_process_id, 2013 int render_process_id,
2014 int render_frame_id, 2014 int render_frame_id,
2015 const net::HttpNetworkSession* network_session, 2015 const net::HttpNetworkSession* network_session,
2016 net::SSLCertRequestInfo* cert_request_info, 2016 net::SSLCertRequestInfo* cert_request_info,
2017 const base::Callback<void(net::X509Certificate*)>& callback) { 2017 const base::Callback<void(net::X509Certificate*)>& callback) {
2018 content::RenderFrameHost* rfh = content::RenderFrameHost::FromID( 2018 content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(
(...skipping 877 matching lines...) Expand 10 before | Expand all | Expand 10 after
2896 switches::kDisableWebRtcEncryption, 2896 switches::kDisableWebRtcEncryption,
2897 }; 2897 };
2898 to_command_line->CopySwitchesFrom(from_command_line, 2898 to_command_line->CopySwitchesFrom(from_command_line,
2899 kWebRtcDevSwitchNames, 2899 kWebRtcDevSwitchNames,
2900 arraysize(kWebRtcDevSwitchNames)); 2900 arraysize(kWebRtcDevSwitchNames));
2901 } 2901 }
2902 } 2902 }
2903 #endif // defined(ENABLE_WEBRTC) 2903 #endif // defined(ENABLE_WEBRTC)
2904 2904
2905 } // namespace chrome 2905 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698