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

Side by Side Diff: chrome/browser/renderer_host/x509_user_cert_resource_handler.cc

Issue 6166010: net: Remove typedef net::URLRequestStatus URLRequestStatus; (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 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) 2009 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/renderer_host/x509_user_cert_resource_handler.h" 5 #include "chrome/browser/renderer_host/x509_user_cert_resource_handler.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "chrome/browser/download/download_types.h" 8 #include "chrome/browser/download/download_types.h"
9 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" 9 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
10 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h" 10 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h"
11 #include "chrome/browser/ssl/ssl_add_cert_handler.h" 11 #include "chrome/browser/ssl/ssl_add_cert_handler.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 net::IOBuffer* buffer = NULL; 86 net::IOBuffer* buffer = NULL;
87 read_buffer_.swap(&buffer); 87 read_buffer_.swap(&buffer);
88 // TODO(gauravsh): Should this be handled by a separate thread? 88 // TODO(gauravsh): Should this be handled by a separate thread?
89 buffer_->contents.push_back(std::make_pair(buffer, *bytes_read)); 89 buffer_->contents.push_back(std::make_pair(buffer, *bytes_read));
90 90
91 return true; 91 return true;
92 } 92 }
93 93
94 bool X509UserCertResourceHandler::OnResponseCompleted( 94 bool X509UserCertResourceHandler::OnResponseCompleted(
95 int request_id, 95 int request_id,
96 const URLRequestStatus& urs, 96 const net::URLRequestStatus& urs,
97 const std::string& sec_info) { 97 const std::string& sec_info) {
98 if (urs.status() != URLRequestStatus::SUCCESS) 98 if (urs.status() != net::URLRequestStatus::SUCCESS)
99 return false; 99 return false;
100 100
101 // TODO(gauravsh): Verify that 'request_id' was actually a keygen form post 101 // TODO(gauravsh): Verify that 'request_id' was actually a keygen form post
102 // and only then import the certificate. 102 // and only then import the certificate.
103 AssembleResource(); 103 AssembleResource();
104 scoped_refptr<net::X509Certificate> cert( 104 scoped_refptr<net::X509Certificate> cert(
105 net::X509Certificate::CreateFromBytes(resource_buffer_->data(), 105 net::X509Certificate::CreateFromBytes(resource_buffer_->data(),
106 content_length_)); 106 content_length_));
107 // The handler will run the UI and delete itself when it's finished. 107 // The handler will run the UI and delete itself when it's finished.
108 new SSLAddCertHandler(request_, cert, render_process_host_id_, 108 new SSLAddCertHandler(request_, cert, render_process_host_id_,
(...skipping 12 matching lines...) Expand all
121 resource_buffer_ = new net::IOBuffer(content_length_); 121 resource_buffer_ = new net::IOBuffer(content_length_);
122 122
123 for (size_t i = 0; i < buffer_->contents.size(); ++i) { 123 for (size_t i = 0; i < buffer_->contents.size(); ++i) {
124 net::IOBuffer* data = buffer_->contents[i].first; 124 net::IOBuffer* data = buffer_->contents[i].first;
125 const int data_len = buffer_->contents[i].second; 125 const int data_len = buffer_->contents[i].second;
126 DCHECK(bytes_copied + data_len <= content_length_); 126 DCHECK(bytes_copied + data_len <= content_length_);
127 memcpy(resource_buffer_->data() + bytes_copied, data->data(), data_len); 127 memcpy(resource_buffer_->data() + bytes_copied, data->data(), data_len);
128 bytes_copied += data_len; 128 bytes_copied += data_len;
129 } 129 }
130 } 130 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/sync_resource_handler.cc ('k') | chrome/browser/safe_browsing/client_side_detection_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698