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

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

Issue 5685007: Rename all methods accessing Singleton<T> as GetInstance(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 strings.SetString("textdirection", base::i18n::IsRTL() ? "rtl" : "ltr"); 96 strings.SetString("textdirection", base::i18n::IsRTL() ? "rtl" : "ltr");
97 97
98 base::StringPiece html( 98 base::StringPiece html(
99 ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id)); 99 ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id));
100 100
101 return jstemplate_builder::GetI18nTemplateHtml(html, &strings); 101 return jstemplate_builder::GetI18nTemplateHtml(html, &strings);
102 } 102 }
103 103
104 void SSLBlockingPage::UpdateEntry(NavigationEntry* entry) { 104 void SSLBlockingPage::UpdateEntry(NavigationEntry* entry) {
105 const net::SSLInfo& ssl_info = handler_->ssl_info(); 105 const net::SSLInfo& ssl_info = handler_->ssl_info();
106 int cert_id = CertStore::GetSharedInstance()->StoreCert( 106 int cert_id = CertStore::GetInstance()->StoreCert(
107 ssl_info.cert, tab()->render_view_host()->process()->id()); 107 ssl_info.cert, tab()->render_view_host()->process()->id());
108 108
109 entry->ssl().set_security_style(SECURITY_STYLE_AUTHENTICATION_BROKEN); 109 entry->ssl().set_security_style(SECURITY_STYLE_AUTHENTICATION_BROKEN);
110 entry->ssl().set_cert_id(cert_id); 110 entry->ssl().set_cert_id(cert_id);
111 entry->ssl().set_cert_status(ssl_info.cert_status); 111 entry->ssl().set_cert_status(ssl_info.cert_status);
112 entry->ssl().set_security_bits(ssl_info.security_bits); 112 entry->ssl().set_security_bits(ssl_info.security_bits);
113 NotificationService::current()->Notify( 113 NotificationService::current()->Notify(
114 NotificationType::SSL_VISIBLE_STATE_CHANGED, 114 NotificationType::SSL_VISIBLE_STATE_CHANGED,
115 Source<NavigationController>(&tab()->controller()), 115 Source<NavigationController>(&tab()->controller()),
116 NotificationService::NoDetails()); 116 NotificationService::NoDetails());
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 "moreInfo1", "moreInfo2", "moreInfo3", "moreInfo4", "moreInfo5" 164 "moreInfo1", "moreInfo2", "moreInfo3", "moreInfo4", "moreInfo5"
165 }; 165 };
166 int i; 166 int i;
167 for (i = 0; i < static_cast<int>(extra_info.size()); i++) { 167 for (i = 0; i < static_cast<int>(extra_info.size()); i++) {
168 strings->SetString(keys[i], WideToUTF16Hack(extra_info[i])); 168 strings->SetString(keys[i], WideToUTF16Hack(extra_info[i]));
169 } 169 }
170 for (; i < 5; i++) { 170 for (; i < 5; i++) {
171 strings->SetString(keys[i], ""); 171 strings->SetString(keys[i], "");
172 } 172 }
173 } 173 }
OLDNEW
« no previous file with comments | « chrome/browser/service/service_process_control_manager.cc ('k') | chrome/browser/ssl/ssl_error_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698