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

Side by Side Diff: chrome/browser/ssl/ssl_blocking_page.cc

Issue 9195027: In cases of SSL error page due to HSTS, explain why the user cannot proceed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/ssl_error.html ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ssl/ssl_blocking_page.h" 5 #include "chrome/browser/ssl/ssl_blocking_page.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/string_piece.h" 9 #include "base/string_piece.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 l10n_util::GetStringUTF16(IDS_SSL_BLOCKING_PAGE_EXIT)); 96 l10n_util::GetStringUTF16(IDS_SSL_BLOCKING_PAGE_EXIT));
97 strings.SetString("shouldNotProceed", 97 strings.SetString("shouldNotProceed",
98 l10n_util::GetStringUTF16( 98 l10n_util::GetStringUTF16(
99 IDS_SSL_BLOCKING_PAGE_SHOULD_NOT_PROCEED)); 99 IDS_SSL_BLOCKING_PAGE_SHOULD_NOT_PROCEED));
100 } else { 100 } else {
101 resource_id = IDR_SSL_ERROR_HTML; 101 resource_id = IDR_SSL_ERROR_HTML;
102 strings.SetString("title", 102 strings.SetString("title",
103 l10n_util::GetStringUTF16(IDS_SSL_ERROR_PAGE_TITLE)); 103 l10n_util::GetStringUTF16(IDS_SSL_ERROR_PAGE_TITLE));
104 strings.SetString("back", 104 strings.SetString("back",
105 l10n_util::GetStringUTF16(IDS_SSL_ERROR_PAGE_BACK)); 105 l10n_util::GetStringUTF16(IDS_SSL_ERROR_PAGE_BACK));
106 strings.SetString("cannotProceed",
107 l10n_util::GetStringUTF16(
108 IDS_SSL_ERROR_PAGE_CANNOT_PROCEED));
106 } 109 }
107 110
108 strings.SetString("textdirection", base::i18n::IsRTL() ? "rtl" : "ltr"); 111 strings.SetString("textdirection", base::i18n::IsRTL() ? "rtl" : "ltr");
109 112
110 base::StringPiece html( 113 base::StringPiece html(
111 ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id)); 114 ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id));
112 115
113 return jstemplate_builder::GetI18nTemplateHtml(html, &strings); 116 return jstemplate_builder::GetI18nTemplateHtml(html, &strings);
114 } 117 }
115 118
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 "moreInfo1", "moreInfo2", "moreInfo3", "moreInfo4", "moreInfo5" 184 "moreInfo1", "moreInfo2", "moreInfo3", "moreInfo4", "moreInfo5"
182 }; 185 };
183 int i; 186 int i;
184 for (i = 0; i < static_cast<int>(extra_info.size()); i++) { 187 for (i = 0; i < static_cast<int>(extra_info.size()); i++) {
185 strings->SetString(keys[i], extra_info[i]); 188 strings->SetString(keys[i], extra_info[i]);
186 } 189 }
187 for (; i < 5; i++) { 190 for (; i < 5; i++) {
188 strings->SetString(keys[i], ""); 191 strings->SetString(keys[i], "");
189 } 192 }
190 } 193 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/ssl_error.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698