| 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 | 101 |
| 102 base::StringPiece html( | 102 base::StringPiece html( |
| 103 ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id)); | 103 ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id)); |
| 104 | 104 |
| 105 return jstemplate_builder::GetI18nTemplateHtml(html, &strings); | 105 return jstemplate_builder::GetI18nTemplateHtml(html, &strings); |
| 106 } | 106 } |
| 107 | 107 |
| 108 void SSLBlockingPage::UpdateEntry(NavigationEntry* entry) { | 108 void SSLBlockingPage::UpdateEntry(NavigationEntry* entry) { |
| 109 const net::SSLInfo& ssl_info = handler_->ssl_info(); | 109 const net::SSLInfo& ssl_info = handler_->ssl_info(); |
| 110 int cert_id = CertStore::GetInstance()->StoreCert( | 110 int cert_id = CertStore::GetInstance()->StoreCert( |
| 111 ssl_info.cert, tab()->render_view_host()->process()->id()); | 111 ssl_info.cert, tab()->render_view_host()->process()->GetID()); |
| 112 | 112 |
| 113 entry->ssl().set_security_style( | 113 entry->ssl().set_security_style( |
| 114 content::SECURITY_STYLE_AUTHENTICATION_BROKEN); | 114 content::SECURITY_STYLE_AUTHENTICATION_BROKEN); |
| 115 entry->ssl().set_cert_id(cert_id); | 115 entry->ssl().set_cert_id(cert_id); |
| 116 entry->ssl().set_cert_status(ssl_info.cert_status); | 116 entry->ssl().set_cert_status(ssl_info.cert_status); |
| 117 entry->ssl().set_security_bits(ssl_info.security_bits); | 117 entry->ssl().set_security_bits(ssl_info.security_bits); |
| 118 content::NotificationService::current()->Notify( | 118 content::NotificationService::current()->Notify( |
| 119 content::NOTIFICATION_SSL_VISIBLE_STATE_CHANGED, | 119 content::NOTIFICATION_SSL_VISIBLE_STATE_CHANGED, |
| 120 content::Source<NavigationController>(&tab()->controller()), | 120 content::Source<NavigationController>(&tab()->controller()), |
| 121 content::NotificationService::NoDetails()); | 121 content::NotificationService::NoDetails()); |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 "moreInfo1", "moreInfo2", "moreInfo3", "moreInfo4", "moreInfo5" | 173 "moreInfo1", "moreInfo2", "moreInfo3", "moreInfo4", "moreInfo5" |
| 174 }; | 174 }; |
| 175 int i; | 175 int i; |
| 176 for (i = 0; i < static_cast<int>(extra_info.size()); i++) { | 176 for (i = 0; i < static_cast<int>(extra_info.size()); i++) { |
| 177 strings->SetString(keys[i], extra_info[i]); | 177 strings->SetString(keys[i], extra_info[i]); |
| 178 } | 178 } |
| 179 for (; i < 5; i++) { | 179 for (; i < 5; i++) { |
| 180 strings->SetString(keys[i], ""); | 180 strings->SetString(keys[i], ""); |
| 181 } | 181 } |
| 182 } | 182 } |
| OLD | NEW |