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

Side by Side Diff: chrome/browser/tab_contents/tab_contents_ssl_helper.cc

Issue 10698111: browser: Move more files into chrome namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months 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) 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/tab_contents/tab_contents_ssl_helper.h" 5 #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 : tab_contents_(tab_contents) { 188 : tab_contents_(tab_contents) {
189 } 189 }
190 190
191 TabContentsSSLHelper::~TabContentsSSLHelper() { 191 TabContentsSSLHelper::~TabContentsSSLHelper() {
192 } 192 }
193 193
194 void TabContentsSSLHelper::ShowClientCertificateRequestDialog( 194 void TabContentsSSLHelper::ShowClientCertificateRequestDialog(
195 const net::HttpNetworkSession* network_session, 195 const net::HttpNetworkSession* network_session,
196 net::SSLCertRequestInfo* cert_request_info, 196 net::SSLCertRequestInfo* cert_request_info,
197 const base::Callback<void(net::X509Certificate*)>& callback) { 197 const base::Callback<void(net::X509Certificate*)>& callback) {
198 browser::ShowSSLClientCertificateSelector( 198 chrome::ShowSSLClientCertificateSelector(
199 tab_contents_, network_session, cert_request_info, callback); 199 tab_contents_, network_session, cert_request_info, callback);
200 } 200 }
201 201
202 void TabContentsSSLHelper::OnVerifyClientCertificateError( 202 void TabContentsSSLHelper::OnVerifyClientCertificateError(
203 scoped_refptr<SSLAddCertHandler> handler, int error_code) { 203 scoped_refptr<SSLAddCertHandler> handler, int error_code) {
204 SSLAddCertData* add_cert_data = GetAddCertData(handler); 204 SSLAddCertData* add_cert_data = GetAddCertData(handler);
205 // Display an infobar with the error message. 205 // Display an infobar with the error message.
206 // TODO(davidben): Display a more user-friendly error string. 206 // TODO(davidben): Display a more user-friendly error string.
207 add_cert_data->ShowErrorInfoBar( 207 add_cert_data->ShowErrorInfoBar(
208 l10n_util::GetStringFUTF16(IDS_ADD_CERT_ERR_INVALID_CERT, 208 l10n_util::GetStringFUTF16(IDS_ADD_CERT_ERR_INVALID_CERT,
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 TabContentsSSLHelper::SSLAddCertData* TabContentsSSLHelper::GetAddCertData( 243 TabContentsSSLHelper::SSLAddCertData* TabContentsSSLHelper::GetAddCertData(
244 SSLAddCertHandler* handler) { 244 SSLAddCertHandler* handler) {
245 // Find/create the slot. 245 // Find/create the slot.
246 linked_ptr<SSLAddCertData>& ptr_ref = 246 linked_ptr<SSLAddCertData>& ptr_ref =
247 request_id_to_add_cert_data_[handler->network_request_id()]; 247 request_id_to_add_cert_data_[handler->network_request_id()];
248 // Fill it if necessary. 248 // Fill it if necessary.
249 if (!ptr_ref.get()) 249 if (!ptr_ref.get())
250 ptr_ref.reset(new SSLAddCertData(tab_contents_)); 250 ptr_ref.reset(new SSLAddCertData(tab_contents_));
251 return ptr_ref.get(); 251 return ptr_ref.get();
252 } 252 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl_client_certificate_selector.h ('k') | chrome/browser/ui/android/ssl_client_certificate_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698