| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "net/ssl/channel_id_service.h" | 5 #include "net/ssl/channel_id_service.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 if (key) | 194 if (key) |
| 195 key_copy = key->Copy(); | 195 key_copy = key->Copy(); |
| 196 (*i)->Post(error, std::move(key_copy)); | 196 (*i)->Post(error, std::move(key_copy)); |
| 197 } | 197 } |
| 198 } | 198 } |
| 199 | 199 |
| 200 std::vector<ChannelIDService::Request*> requests_; | 200 std::vector<ChannelIDService::Request*> requests_; |
| 201 bool create_if_missing_; | 201 bool create_if_missing_; |
| 202 }; | 202 }; |
| 203 | 203 |
| 204 // static | |
| 205 const char ChannelIDService::kEPKIPassword[] = ""; | |
| 206 | |
| 207 ChannelIDService::Request::Request() : service_(NULL) { | 204 ChannelIDService::Request::Request() : service_(NULL) { |
| 208 } | 205 } |
| 209 | 206 |
| 210 ChannelIDService::Request::~Request() { | 207 ChannelIDService::Request::~Request() { |
| 211 Cancel(); | 208 Cancel(); |
| 212 } | 209 } |
| 213 | 210 |
| 214 void ChannelIDService::Request::Cancel() { | 211 void ChannelIDService::Request::Cancel() { |
| 215 if (service_) { | 212 if (service_) { |
| 216 RecordGetChannelIDResult(ASYNC_CANCELLED); | 213 RecordGetChannelIDResult(ASYNC_CANCELLED); |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 } | 513 } |
| 517 | 514 |
| 518 return err; | 515 return err; |
| 519 } | 516 } |
| 520 | 517 |
| 521 int ChannelIDService::channel_id_count() { | 518 int ChannelIDService::channel_id_count() { |
| 522 return channel_id_store_->GetChannelIDCount(); | 519 return channel_id_store_->GetChannelIDCount(); |
| 523 } | 520 } |
| 524 | 521 |
| 525 } // namespace net | 522 } // namespace net |
| OLD | NEW |