| OLD | NEW |
| 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 | 82 |
| 83 int resource_id; | 83 int resource_id; |
| 84 if (overridable_) { | 84 if (overridable_) { |
| 85 resource_id = IDR_SSL_ROAD_BLOCK_HTML; | 85 resource_id = IDR_SSL_ROAD_BLOCK_HTML; |
| 86 strings.SetString("title", | 86 strings.SetString("title", |
| 87 l10n_util::GetStringUTF16(IDS_SSL_BLOCKING_PAGE_TITLE)); | 87 l10n_util::GetStringUTF16(IDS_SSL_BLOCKING_PAGE_TITLE)); |
| 88 strings.SetString("proceed", | 88 strings.SetString("proceed", |
| 89 l10n_util::GetStringUTF16(IDS_SSL_BLOCKING_PAGE_PROCEED)); | 89 l10n_util::GetStringUTF16(IDS_SSL_BLOCKING_PAGE_PROCEED)); |
| 90 strings.SetString("exit", | 90 strings.SetString("exit", |
| 91 l10n_util::GetStringUTF16(IDS_SSL_BLOCKING_PAGE_EXIT)); | 91 l10n_util::GetStringUTF16(IDS_SSL_BLOCKING_PAGE_EXIT)); |
| 92 strings.SetString("shouldNotProceed", |
| 93 l10n_util::GetStringUTF16( |
| 94 IDS_SSL_BLOCKING_PAGE_SHOULD_NOT_PROCEED)); |
| 92 } else { | 95 } else { |
| 93 resource_id = IDR_SSL_ERROR_HTML; | 96 resource_id = IDR_SSL_ERROR_HTML; |
| 94 strings.SetString("title", | 97 strings.SetString("title", |
| 95 l10n_util::GetStringUTF16(IDS_SSL_ERROR_PAGE_TITLE)); | 98 l10n_util::GetStringUTF16(IDS_SSL_ERROR_PAGE_TITLE)); |
| 96 strings.SetString("back", | 99 strings.SetString("back", |
| 97 l10n_util::GetStringUTF16(IDS_SSL_ERROR_PAGE_BACK)); | 100 l10n_util::GetStringUTF16(IDS_SSL_ERROR_PAGE_BACK)); |
| 98 } | 101 } |
| 99 | 102 |
| 100 strings.SetString("textdirection", base::i18n::IsRTL() ? "rtl" : "ltr"); | 103 strings.SetString("textdirection", base::i18n::IsRTL() ? "rtl" : "ltr"); |
| 101 | 104 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 DCHECK(!callback_.is_null()); | 164 DCHECK(!callback_.is_null()); |
| 162 | 165 |
| 163 callback_.Run(handler_, true); | 166 callback_.Run(handler_, true); |
| 164 callback_.Reset(); | 167 callback_.Reset(); |
| 165 } | 168 } |
| 166 | 169 |
| 167 // static | 170 // static |
| 168 void SSLBlockingPage::SetExtraInfo( | 171 void SSLBlockingPage::SetExtraInfo( |
| 169 DictionaryValue* strings, | 172 DictionaryValue* strings, |
| 170 const std::vector<string16>& extra_info) { | 173 const std::vector<string16>& extra_info) { |
| 171 DCHECK(extra_info.size() < 5); // We allow 5 paragraphs max. | 174 DCHECK_LT(extra_info.size(), 5U); // We allow 5 paragraphs max. |
| 172 const char* keys[5] = { | 175 const char* keys[5] = { |
| 173 "moreInfo1", "moreInfo2", "moreInfo3", "moreInfo4", "moreInfo5" | 176 "moreInfo1", "moreInfo2", "moreInfo3", "moreInfo4", "moreInfo5" |
| 174 }; | 177 }; |
| 175 int i; | 178 int i; |
| 176 for (i = 0; i < static_cast<int>(extra_info.size()); i++) { | 179 for (i = 0; i < static_cast<int>(extra_info.size()); i++) { |
| 177 strings->SetString(keys[i], extra_info[i]); | 180 strings->SetString(keys[i], extra_info[i]); |
| 178 } | 181 } |
| 179 for (; i < 5; i++) { | 182 for (; i < 5; i++) { |
| 180 strings->SetString(keys[i], ""); | 183 strings->SetString(keys[i], ""); |
| 181 } | 184 } |
| 182 } | 185 } |
| OLD | NEW |