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

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: Too many constructors 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 1904 matching lines...) Expand 10 before | Expand all | Expand 10 after
1915 } 1915 }
1916 1916
1917 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 1917 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
1918 CaptivePortalTabHelper* captive_portal_tab_helper = 1918 CaptivePortalTabHelper* captive_portal_tab_helper =
1919 CaptivePortalTabHelper::FromWebContents(tab); 1919 CaptivePortalTabHelper::FromWebContents(tab);
1920 if (captive_portal_tab_helper) 1920 if (captive_portal_tab_helper)
1921 captive_portal_tab_helper->OnSSLCertError(ssl_info); 1921 captive_portal_tab_helper->OnSSLCertError(ssl_info);
1922 #endif 1922 #endif
1923 1923
1924 // Otherwise, display an SSL blocking page. 1924 // Otherwise, display an SSL blocking page.
1925 new SSLBlockingPage(tab, cert_error, ssl_info, request_url, overridable, 1925 new SSLBlockingPage(tab, true, cert_error, ssl_info, request_url, overridable,
1926 strict_enforcement, callback); 1926 strict_enforcement, callback);
1927 } 1927 }
1928 1928
1929 void ChromeContentBrowserClient::SelectClientCertificate( 1929 void ChromeContentBrowserClient::SelectClientCertificate(
1930 int render_process_id, 1930 int render_process_id,
1931 int render_frame_id, 1931 int render_frame_id,
1932 const net::HttpNetworkSession* network_session, 1932 const net::HttpNetworkSession* network_session,
1933 net::SSLCertRequestInfo* cert_request_info, 1933 net::SSLCertRequestInfo* cert_request_info,
1934 const base::Callback<void(net::X509Certificate*)>& callback) { 1934 const base::Callback<void(net::X509Certificate*)>& callback) {
1935 content::RenderFrameHost* rfh = content::RenderFrameHost::FromID( 1935 content::RenderFrameHost* rfh = content::RenderFrameHost::FromID(
(...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after
2803 switches::kDisableWebRtcEncryption, 2803 switches::kDisableWebRtcEncryption,
2804 }; 2804 };
2805 to_command_line->CopySwitchesFrom(from_command_line, 2805 to_command_line->CopySwitchesFrom(from_command_line,
2806 kWebRtcDevSwitchNames, 2806 kWebRtcDevSwitchNames,
2807 arraysize(kWebRtcDevSwitchNames)); 2807 arraysize(kWebRtcDevSwitchNames));
2808 } 2808 }
2809 } 2809 }
2810 #endif // defined(ENABLE_WEBRTC) 2810 #endif // defined(ENABLE_WEBRTC)
2811 2811
2812 } // namespace chrome 2812 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/safe_browsing/safe_browsing_blocking_page.h » ('j') | chrome/browser/ssl/ssl_blocking_page.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698