chrome/browser/resources/safe_browsing_multiple_threat_block.html - Issue 10694037: Add a policy to disable proceeding through the Safe Browsing interstitials.

Unified Diff: chrome/browser/resources/safe_browsing_multiple_threat_block.html

Issue 10694037: Add a policy to disable proceeding through the Safe Browsing interstitials. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fixed <button>/jstemplate Created 8 years, 6 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/resources/safe_browsing_malware_block.html ('K') | « chrome/browser/resources/safe_browsing_malware_block.html ('k') | chrome/browser/resources/safe_browsing_phishing_block.html » ('j') | chrome/browser/safe_browsing/safe_browsing_blocking_page.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/safe_browsing_multiple_threat_block.html

diff --git a/chrome/browser/resources/safe_browsing_multiple_threat_block.html b/chrome/browser/resources/safe_browsing_multiple_threat_block.html

index 40dd0c4efea99375a18ca0e2d6962e5deecea868..d031670e8d0eda0c5722803e2a73681a8d6c95ae 100644

--- a/chrome/browser/resources/safe_browsing_multiple_threat_block.html

+++ b/chrome/browser/resources/safe_browsing_multiple_threat_block.html

@@ -87,34 +87,36 @@ function sendCommand(command) {

window.domAutomationController.send(command);

}

-function showDiagnostic(errorID) {

- sendCommand("showDiagnostic:" + errorID);

-function reportError(errorID) {

- sendCommand("reportError:" + errorID);

function learnMore() {

- sendCommand("learnMore");

+ sendCommand('learnMore');

}

function proceed() {

- sendCommand("proceed");

+ sendCommand('proceed');

}

function takeMeBack() {

- sendCommand("takeMeBack");

+ sendCommand('takeMeBack');

+function showOrReport() {

James Hawkins 2012/07/02 15:56:06 nit: Document method.

Joao da Silva 2012/07/03 13:39:52 Done.

+ var id = this.getAttribute('chromiumID');

+ var isMalware = this.getAttribute('chromiumIsMalware');

+ var cmd = isMalware ? 'showDiagnostic:' : 'reportError:';

+ sendCommand(cmd + id);

+ return false;

James Hawkins 2012/07/02 15:56:06 Why are you returning any value?

Joao da Silva 2012/07/03 13:39:52 Again, this isn't my code. Returning false from an

}

</script>

</head>

-<div class="background"><img src="ssl_roadblock_background.png" width="100%" height="100%" alt="background" onmousedown="return false;"/></div>

+<div class="background"><img src="ssl_roadblock_background.png" width="100%"

James Hawkins 2012/07/02 15:56:06 Newlines for <img> and </div>.

Joao da Silva 2012/07/03 13:39:52 Done.

+ height="100%" alt="background" onmousedown="return false;"/></div>

- <div class="icon"><img src="shared/images/phishing_icon.png" alt="Malware Icon" onmousedown="return false;"/></div>

+ <div class="icon"><img src="shared/images/phishing_icon.png"

+ alt="Malware Icon" onmousedown="return false;"/></div>

@@ -123,17 +125,28 @@ function takeMeBack() {

- <td><a href="" onclick="var id= this.getAttribute('chromiumID'); this.getAttribute('chromiumIsMalware') ? showDiagnostic(id) : reportError(id); return false;" jscontent="errorLink" jsvalues="chromiumID:$counter.value;chromiumIsMalware:type=='malware'" jseval="$counter.value++"></a></td>

+ <td><a href="" onclick="showOrReport()"

+ jsvalues="chromiumID:$counter.value;chromiumIsMalware:type=='malware'"

+ jscontent="errorLink" jseval="$counter.value++"></a></td>

</tr>

</table>

</div>

- <div class="main"><a href="" i18n-content="description3" onclick="learnMore(); return false;" onmousedown="return false;"></a></div>

+ <div class="main"><a href="" i18n-content="description3"

+ onclick="learnMore(); return false;"

+ onmousedown="return false;"></a></div>

- <input name="checky" id="checky" type="checkbox" onclick="agreed(this.form)"> <label for="checky" i18n-content="confirm_text"></label>

- <input type="button" name="continue_button" i18n-values="value:continue_button" disabled="true" onclick="proceed();"><br>

- <input type="button" name="back_button" i18n-values="value:back_button" onclick="takeMeBack()">

+ <input name="checky" id="checky" type="checkbox"

+ jsdisplay="!proceedDisabled"

+ onclick="agreed(this.form)"> 

+ <label for="checky" i18n-content="confirm_text"

+ jsdisplay="!proceedDisabled"></label>

+ <button name="continue_button" i18n-content="continue_button"

+ disabled="true" jsdisplay="!proceedDisabled"

+ onclick="proceed();"></button><br>

+ <button name="back_button" i18n-content="back_button"

+ onclick="takeMeBack()"></button>

</form>

</div>