Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/build_time.h" | 7 #include "base/build_time.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
| 10 #include "base/i18n/time_formatting.h" | 10 #include "base/i18n/time_formatting.h" |
| (...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 463 load_time_data.SetString( | 463 load_time_data.SetString( |
| 464 "primaryButtonText", | 464 "primaryButtonText", |
| 465 l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_SAFETY_BUTTON)); | 465 l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_SAFETY_BUTTON)); |
| 466 load_time_data.SetString( | 466 load_time_data.SetString( |
| 467 "finalParagraph", | 467 "finalParagraph", |
| 468 l10n_util::GetStringFUTF16(IDS_SSL_OVERRIDABLE_PROCEED_PARAGRAPH, | 468 l10n_util::GetStringFUTF16(IDS_SSL_OVERRIDABLE_PROCEED_PARAGRAPH, |
| 469 url)); | 469 url)); |
| 470 } else { | 470 } else { |
| 471 SSLErrorInfo::ErrorType type = | 471 SSLErrorInfo::ErrorType type = |
| 472 SSLErrorInfo::NetErrorToErrorType(cert_error_); | 472 SSLErrorInfo::NetErrorToErrorType(cert_error_); |
| 473 if (type == SSLErrorInfo::CERT_INVALID && SSLErrorClassification:: | 473 if (type == SSLErrorInfo::CERT_INVALID && !SSLErrorClassification:: |
| 474 IsWindowsVersionSP3OrLower()) { | 474 MaybeOSHasSHA256Support()) { |
| 475 load_time_data.SetString( | 475 load_time_data.SetString( |
|
felt
2014/09/18 18:30:36
This check displays the string IDS_SSL_NONOVERRIDA
Sorin Jianu
2014/09/18 18:41:07
The observable behavior of the code should be the
felt
2014/09/18 18:44:27
No, if the behavior is the same, then that's fine.
felt
2014/09/18 18:52:23
(Please feel free to add the platform specific com
| |
| 476 "explanationParagraph", | 476 "explanationParagraph", |
| 477 l10n_util::GetStringFUTF16( | 477 l10n_util::GetStringFUTF16( |
| 478 IDS_SSL_NONOVERRIDABLE_MORE_INVALID_SP3, url)); | 478 IDS_SSL_NONOVERRIDABLE_MORE_INVALID_SP3, url)); |
| 479 } else if (bad_clock) { | 479 } else if (bad_clock) { |
| 480 load_time_data.SetString("explanationParagraph", | 480 load_time_data.SetString("explanationParagraph", |
| 481 l10n_util::GetStringFUTF16( | 481 l10n_util::GetStringFUTF16( |
| 482 IDS_SSL_CLOCK_ERROR_EXPLANATION, url)); | 482 IDS_SSL_CLOCK_ERROR_EXPLANATION, url)); |
| 483 } else { | 483 } else { |
| 484 load_time_data.SetString("explanationParagraph", | 484 load_time_data.SetString("explanationParagraph", |
| 485 l10n_util::GetStringFUTF16( | 485 l10n_util::GetStringFUTF16( |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 653 for (; i < 5; i++) { | 653 for (; i < 5; i++) { |
| 654 strings->SetString(keys[i], std::string()); | 654 strings->SetString(keys[i], std::string()); |
| 655 } | 655 } |
| 656 } | 656 } |
| 657 | 657 |
| 658 void SSLBlockingPage::OnGotHistoryCount(bool success, | 658 void SSLBlockingPage::OnGotHistoryCount(bool success, |
| 659 int num_visits, | 659 int num_visits, |
| 660 base::Time first_visit) { | 660 base::Time first_visit) { |
| 661 num_visits_ = num_visits; | 661 num_visits_ = num_visits; |
| 662 } | 662 } |
| OLD | NEW |