summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorfelt@chromium.org <felt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-21 13:44:20 +0000
committerfelt@chromium.org <felt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-21 13:44:20 +0000
commitdafce9391001ffc084ac922e293e3a69bcdb0032 (patch)
tree7660e539c1813c599605f1e119fda6c4d4871010 /chrome/common
parent556672b0a511b4ae9a132dc5cb0d0b808f846d71 (diff)
downloadchromium_src-dafce9391001ffc084ac922e293e3a69bcdb0032.zip
chromium_src-dafce9391001ffc084ac922e293e3a69bcdb0032.tar.gz
chromium_src-dafce9391001ffc084ac922e293e3a69bcdb0032.tar.bz2
Add experimental versions of the SSL interstitial
This adds a few experimental versions of the new SSL interstitial: 1. The old layout (V1) 2. The new layout (V2) 3. The new layout, with a yellow background 4. The new layout, with a crossing guard image 5. The old layout with the new layout's text Binary images in: https://codereview.chromium.org/340173002 BUG=386033 Review URL: https://codereview.chromium.org/341653006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/chrome_switches.cc8
-rw-r--r--chrome/common/chrome_switches.h8
2 files changed, 10 insertions, 6 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 91edcf0..7c1d7c2 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1141,9 +1141,11 @@ const char kSpellingServiceFeedbackIntervalSeconds[] =
"spelling-service-feedback-interval-seconds";
// Controls which version of the TLS/SSL interstitial is shown.
-const char kSSLInterstitialVersionV1[] = "ssl-interstitial-v1";
-const char kSSLInterstitialVersionV2Gray[] = "ssl-interstitial-v2-gray";
-const char kSSLInterstitialVersionV2Colorful[] = "ssl-interstitial-v2-colorful";
+const char kSSLInterstitialV1[] = "ssl-interstitial-v1";
+const char kSSLInterstitialV2[] = "ssl-interstitial-v2";
+const char kSSLInterstitialV1WithV2Text[] = "ssl-interstitial-v1-v2-text";
+const char kSSLInterstitialV2Yellow[] = "ssl-interstitial-v2-yellow";
+const char kSSLInterstitialV2Guard[] = "ssl-interstitial-v2-guard";
// Specifies the maximum SSL/TLS version ("ssl3", "tls1", "tls1.1", or
// "tls1.2").
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index c81f91f..59583f5 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -315,9 +315,11 @@ extern const char kSimulateOutdated[];
extern const char kSimulateOutdatedNoAU[];
extern const char kSpellingServiceFeedbackUrl[];
extern const char kSpellingServiceFeedbackIntervalSeconds[];
-extern const char kSSLInterstitialVersionV1[];
-extern const char kSSLInterstitialVersionV2Gray[];
-extern const char kSSLInterstitialVersionV2Colorful[];
+extern const char kSSLInterstitialV1[];
+extern const char kSSLInterstitialV2[];
+extern const char kSSLInterstitialV1WithV2Text[];
+extern const char kSSLInterstitialV2Yellow[];
+extern const char kSSLInterstitialV2Guard[];
extern const char kSSLVersionMax[];
extern const char kSSLVersionMin[];
extern const char kStartMaximized[];