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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/ssl/roadblock.html

Issue 14752005: Finch experiments on SSL, malware, and phishing interstitials (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes for James's review Created 7 years, 8 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
« no previous file with comments | « chrome/browser/resources/ssl/policeman.png ('k') | chrome/browser/resources/ssl/roadblock_background.png » ('j') | chrome/browser/safe_browsing/safe_browsing_blocking_page.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/ssl/roadblock.html
diff --git a/chrome/browser/resources/ssl_roadblock.html b/chrome/browser/resources/ssl/roadblock.html
similarity index 72%
rename from chrome/browser/resources/ssl_roadblock.html
rename to chrome/browser/resources/ssl/roadblock.html
index 57b22f3eec113ebc8c89ae4b8bdfff3281a2c894..d6584e8aece901d05de484976c9e24128dfff2d2 100644
--- a/chrome/browser/resources/ssl_roadblock.html
+++ b/chrome/browser/resources/ssl/roadblock.html
@@ -7,11 +7,11 @@
html {
background-color: rgb(92, 0, 0);
- background-image: url(ssl_roadblock_background.png);
+ background-image: url(roadblock_background.png);
background-repeat: repeat-x;
height: 100%;
}
-
+
html[dir='rtl'] #twisty-closed {
-webkit-transform: scaleX(-1);
}
@@ -39,7 +39,7 @@
.icon {
position:absolute;
}
-
+
.main {
margin: 1em 80px;
}
@@ -69,6 +69,30 @@
margin: 0 77px 6pt;
}
+ #trial-badguy {
+ float:right;
+ height:144px;
+ padding-left: 10px;
+ padding-right: 30px;
+ width:144px;
+ }
+
+ #trial-policeman {
+ float:right;
+ height:145px;
+ padding-left: 10px;
+ padding-right: 30px;
+ width:144px;
+ }
+
+ #trial-stoplight {
+ float:right;
+ height:150px;
+ padding-left: 20px;
+ padding-right: 30px;
+ width:63px;
+ }
+
.twisty {
display: inline;
}
@@ -80,7 +104,7 @@
var CMD_PROCEED = 1;
var CMD_FOCUS = 2;
var CMD_MORE = 3;
-
+
var showedMore = false;
var keyPressState = 0;
var gainFocus = false;
@@ -152,7 +176,7 @@
}
$('exit-button').addEventListener('click', function() {
- sendCommand(CMD_DONT_PROCEED);
+ sendCommand(CMD_DONT_PROCEED);
});
document.addEventListener('contextmenu', function(e) {
@@ -160,16 +184,50 @@
});
}
+ function setupInterstitialExperiment() {
+ var condition = templateData.trialType;
+ if (condition == '' || condition == 'Default') {
+ return; // This is the most common case.
+ } else if (condition == 'Condition18SSLNoImages') {
+ $('roadblock-icon').style.display = 'none';
+ } else if (condition == 'Condition19SSLPoliceman') {
+ $('trial-policeman').hidden = false;
+ $('more-info-short').style.marginRight = '30px';
+ $('more-info-long').style.marginRight = '30px';
+ } else if (condition == 'Condition20SSLStoplight') {
+ $('trial-stoplight').hidden = false;
+ $('more-info-short').style.marginRight = '30px';
+ $('more-info-long').style.marginRight = '30px';
+ } else if (condition == 'Condition21SSLBadGuy') {
+ $('trial-badguy').hidden = false;
+ $('more-info-short').style.marginRight = '30px';
+ $('more-info-long').style.marginRight = '30px';
+ }
+ }
+
window.addEventListener('focus', handleFocusEvent);
document.addEventListener('DOMContentLoaded', setupEvents);
+ document.addEventListener('DOMContentLoaded', setupInterstitialExperiment);
</script>
</head>
<body>
<div class="box">
<div class="icon">
- <img src="ssl_roadblock_icon.png" alt="SSL Error Icon">
+ <img src="roadblock_icon.png" alt="SSL Error Icon" id="roadblock-icon">
</div>
<div class="title" i18n-content="headLine"></div>
+
+ <!-- RHS images for the field trial. -->
+ <div id="trial-badguy" hidden>
+ <img src="badguy.png" alt="Bad guy">
+ </div>
+ <div id="trial-policeman" hidden>
+ <img src="policeman.png" alt="Policeman">
+ </div>
+ <div id="trial-stoplight" hidden>
+ <img src="stoplight.png" alt="Stoplight">
+ </div>
+
<div class="main" i18n-values=".innerHTML:description;dir:textdirection"></div>
<div class="main" i18n-values=".innerHTML:reasonForNotProceeding"></div>
<div class="main">
@@ -178,14 +236,14 @@
</div>
<div class="more" id="more-info-short">
<span class="more-link">
- <img id="twisty-closed" class="twisty" src="twisty_closed.png"
+ <img id="twisty-closed" class="twisty" src="twisty_closed.png"
border="0"><span i18n-content="moreInfoTitle" id="more-info-title"
class="show-more-info-title"></span>
</span>
</div>
<div class="more" id="more-info-long" hidden>
<span class="more-link">
- <img class="twisty" src="twisty_open.png" border="0"><span
+ <img class="twisty" src="twisty_open.png" border="0"><span
i18n-content="moreInfoTitle" class="more-info-title"></span>
</span>
<p i18n-values=".innerHTML:moreInfo1"></p>
« no previous file with comments | « chrome/browser/resources/ssl/policeman.png ('k') | chrome/browser/resources/ssl/roadblock_background.png » ('j') | chrome/browser/safe_browsing/safe_browsing_blocking_page.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698