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

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

Issue 578373002: Interstitial options are not OR'd properly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Reverted to no enum in public API Created 6 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:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/webui/interstitials/interstitial_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1694 matching lines...) Expand 10 before | Expand all | Expand 10 after
1705 CaptivePortalTabHelper* captive_portal_tab_helper = 1705 CaptivePortalTabHelper* captive_portal_tab_helper =
1706 CaptivePortalTabHelper::FromWebContents(tab); 1706 CaptivePortalTabHelper::FromWebContents(tab);
1707 if (captive_portal_tab_helper) 1707 if (captive_portal_tab_helper)
1708 captive_portal_tab_helper->OnSSLCertError(ssl_info); 1708 captive_portal_tab_helper->OnSSLCertError(ssl_info);
1709 #endif 1709 #endif
1710 1710
1711 // Otherwise, display an SSL blocking page. The interstitial page takes 1711 // Otherwise, display an SSL blocking page. The interstitial page takes
1712 // ownership of ssl_blocking_page. 1712 // ownership of ssl_blocking_page.
1713 int options_mask = 0; 1713 int options_mask = 0;
1714 if (overridable) 1714 if (overridable)
1715 options_mask = SSLBlockingPage::OVERRIDABLE; 1715 options_mask |= SSLBlockingPage::OVERRIDABLE;
1716 if (strict_enforcement) 1716 if (strict_enforcement)
1717 options_mask = SSLBlockingPage::STRICT_ENFORCEMENT; 1717 options_mask |= SSLBlockingPage::STRICT_ENFORCEMENT;
1718 if (expired_previous_decision) 1718 if (expired_previous_decision)
1719 options_mask = SSLBlockingPage::EXPIRED_BUT_PREVIOUSLY_ALLOWED; 1719 options_mask |= SSLBlockingPage::EXPIRED_BUT_PREVIOUSLY_ALLOWED;
1720 SSLBlockingPage* ssl_blocking_page = new SSLBlockingPage( 1720 SSLBlockingPage* ssl_blocking_page = new SSLBlockingPage(
1721 tab, cert_error, ssl_info, request_url, options_mask, callback); 1721 tab, cert_error, ssl_info, request_url, options_mask, callback);
1722 ssl_blocking_page->Show(); 1722 ssl_blocking_page->Show();
1723 } 1723 }
1724 1724
1725 void ChromeContentBrowserClient::SelectClientCertificate( 1725 void ChromeContentBrowserClient::SelectClientCertificate(
1726 int render_process_id, 1726 int render_process_id,
1727 int render_frame_id, 1727 int render_frame_id,
1728 const net::HttpNetworkSession* network_session, 1728 const net::HttpNetworkSession* network_session,
1729 net::SSLCertRequestInfo* cert_request_info, 1729 net::SSLCertRequestInfo* cert_request_info,
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
2592 switches::kDisableWebRtcEncryption, 2592 switches::kDisableWebRtcEncryption,
2593 }; 2593 };
2594 to_command_line->CopySwitchesFrom(from_command_line, 2594 to_command_line->CopySwitchesFrom(from_command_line,
2595 kWebRtcDevSwitchNames, 2595 kWebRtcDevSwitchNames,
2596 arraysize(kWebRtcDevSwitchNames)); 2596 arraysize(kWebRtcDevSwitchNames));
2597 } 2597 }
2598 } 2598 }
2599 #endif // defined(ENABLE_WEBRTC) 2599 #endif // defined(ENABLE_WEBRTC)
2600 2600
2601 } // namespace chrome 2601 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/interstitials/interstitial_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698