Chromium Code Reviews| Index: chrome/browser/resources/security_warnings/safe_browsing.js |
| diff --git a/chrome/browser/resources/security_warnings/safe_browsing.js b/chrome/browser/resources/security_warnings/safe_browsing.js |
| index 3673da5ceefcc616a57118fa3d285c562b05d3a0..6e3319eaa26cd814ebd016dd570a7a191eee30db 100644 |
| --- a/chrome/browser/resources/security_warnings/safe_browsing.js |
| +++ b/chrome/browser/resources/security_warnings/safe_browsing.js |
| @@ -12,14 +12,24 @@ var SB_CMD_SHOW_DIAGNOSTIC = 'showDiagnostic'; |
| var SB_CMD_SHOW_PRIVACY = 'showPrivacy'; |
| var SB_CMD_TAKE_ME_BACK = 'takeMeBack'; |
| -// Other constants defined in safe_browsing_blocking_page.cc. |
| +// Must match SSLBlockingPageCommands in ssl_blocking_page.h. |
| +var SSL_CMD_DO_REPORT = 6; |
| +var SSL_CMD_DONT_REPORT = 7; |
| + |
| +// Other constants defined in security_interstitial_page.h. |
| var SB_BOX_CHECKED = 'boxchecked'; |
| var SB_DISPLAY_CHECK_BOX = 'displaycheckbox'; |
| -// This sets up the Extended Safe Browsing Reporting opt-in. |
| +// This sets up the Extended Safe Browsing Reporting opt-in, either for |
| +// reporting malware or invalid certificate chains. Does nothing if the |
| +// interstitial type is not SAFEBROWSING or SSL. |
| function setupCheckbox() { |
| - if (loadTimeData.getString('type') != 'SAFEBROWSING' || |
| - !loadTimeData.getBoolean(SB_DISPLAY_CHECK_BOX)) { |
| + var interstitialType = loadTimeData.getString('type'); |
| + if (interstitialType != 'SAFEBROWSING' && interstitialType != 'SSL') { |
| + return; |
| + } |
| + |
| + if (!loadTimeData.getBoolean(SB_DISPLAY_CHECK_BOX)) { |
| return; |
| } |
| @@ -29,7 +39,14 @@ function setupCheckbox() { |
| $('body').classList.add('safe-browsing-has-checkbox'); |
| $('opt-in-checkbox').addEventListener('click', function() { |
| - sendCommand( |
| - $('opt-in-checkbox').checked ? SB_CMD_DO_REPORT : SB_CMD_DONT_REPORT); |
| + var command; |
| + if ($('opt-in-checkbox').checked) { |
| + command = interstitialType == 'SAFEBROWSING' ? |
| + SB_CMD_DO_REPORT : SSL_CMD_DO_REPORT; |
|
felt
2015/02/24 01:57:53
oof, these commands need to be unified in a future
estark
2015/02/24 18:47:09
noted!
|
| + } else { |
| + command = interstitialType == 'SAFEBROWSING' ? |
| + SB_CMD_DONT_REPORT : SSL_CMD_DONT_REPORT; |
| + } |
| + sendCommand(command); |
| }); |
| } |