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

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

Issue 788183006: Use request_url() from SecurityInterstitialPage in SSL interstitials. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
OLDNEW
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 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 "primaryParagraph", 507 "primaryParagraph",
508 l10n_util::GetStringFUTF16(IDS_SSL_V2_PRIMARY_PARAGRAPH, url)); 508 l10n_util::GetStringFUTF16(IDS_SSL_V2_PRIMARY_PARAGRAPH, url));
509 509
510 if (overridable_) { 510 if (overridable_) {
511 load_time_data->SetBoolean("overridable", true); 511 load_time_data->SetBoolean("overridable", true);
512 512
513 SSLErrorInfo error_info = 513 SSLErrorInfo error_info =
514 SSLErrorInfo::CreateError( 514 SSLErrorInfo::CreateError(
515 SSLErrorInfo::NetErrorToErrorType(cert_error_), 515 SSLErrorInfo::NetErrorToErrorType(cert_error_),
516 ssl_info_.cert.get(), 516 ssl_info_.cert.get(),
517 request_url_); 517 request_url());
518 load_time_data->SetString("explanationParagraph", error_info.details()); 518 load_time_data->SetString("explanationParagraph", error_info.details());
519 load_time_data->SetString( 519 load_time_data->SetString(
520 "primaryButtonText", 520 "primaryButtonText",
521 l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_SAFETY_BUTTON)); 521 l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_SAFETY_BUTTON));
522 load_time_data->SetString( 522 load_time_data->SetString(
523 "finalParagraph", 523 "finalParagraph",
524 l10n_util::GetStringFUTF16(IDS_SSL_OVERRIDABLE_PROCEED_PARAGRAPH, 524 l10n_util::GetStringFUTF16(IDS_SSL_OVERRIDABLE_PROCEED_PARAGRAPH,
525 url)); 525 url));
526 } else { 526 } else {
527 load_time_data->SetBoolean("overridable", false); 527 load_time_data->SetBoolean("overridable", false);
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 for (; i < 5; i++) { 719 for (; i < 5; i++) {
720 strings->SetString(keys[i], std::string()); 720 strings->SetString(keys[i], std::string());
721 } 721 }
722 } 722 }
723 723
724 void SSLBlockingPage::OnGotHistoryCount(bool success, 724 void SSLBlockingPage::OnGotHistoryCount(bool success,
725 int num_visits, 725 int num_visits,
726 base::Time first_visit) { 726 base::Time first_visit) {
727 num_visits_ = num_visits; 727 num_visits_ = num_visits;
728 } 728 }
OLDNEW
« chrome/browser/ssl/ssl_blocking_page.h ('K') | « chrome/browser/ssl/ssl_blocking_page.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698