| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #import "ios/web/net/request_tracker_impl.h" | 5 #import "ios/web/net/request_tracker_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 | 55 |
| 56 - (id)init { | 56 - (id)init { |
| 57 self = [super init]; | 57 self = [super init]; |
| 58 if (self) { | 58 if (self) { |
| 59 value_ = 0.0f; | 59 value_ = 0.0f; |
| 60 max_ = 0.0f; | 60 max_ = 0.0f; |
| 61 } | 61 } |
| 62 return self; | 62 return self; |
| 63 } | 63 } |
| 64 | 64 |
| 65 - (BOOL)isForStaticFileRequests { | |
| 66 return NO; | |
| 67 } | |
| 68 | |
| 69 - (void)updatedProgress:(float)progress { | 65 - (void)updatedProgress:(float)progress { |
| 70 if (progress > 0.0f) { | 66 if (progress > 0.0f) { |
| 71 if (progress < value_) { | 67 if (progress < value_) { |
| 72 error_.reset( | 68 error_.reset( |
| 73 [[NSString stringWithFormat: | 69 [[NSString stringWithFormat: |
| 74 @"going down from %f to %f", value_, progress] retain]); | 70 @"going down from %f to %f", value_, progress] retain]); |
| 75 } | 71 } |
| 76 value_ = progress; | 72 value_ = progress; |
| 77 } else { | 73 } else { |
| 78 value_ = 0.0f; | 74 value_ = 0.0f; |
| (...skipping 15 matching lines...) Expand all Loading... |
| 94 - (net::HttpResponseHeaders*)headers { | 90 - (net::HttpResponseHeaders*)headers { |
| 95 return headers_.get(); | 91 return headers_.get(); |
| 96 } | 92 } |
| 97 | 93 |
| 98 - (void)updatedSSLStatus:(const web::SSLStatus&)sslStatus | 94 - (void)updatedSSLStatus:(const web::SSLStatus&)sslStatus |
| 99 forPageUrl:(const GURL&)url | 95 forPageUrl:(const GURL&)url |
| 100 userInfo:(id)userInfo { | 96 userInfo:(id)userInfo { |
| 101 // Nothing. yet. | 97 // Nothing. yet. |
| 102 } | 98 } |
| 103 | 99 |
| 104 - (void)presentSSLError:(const net::SSLInfo&)info | |
| 105 forSSLStatus:(const web::SSLStatus&)status | |
| 106 onUrl:(const GURL&)url | |
| 107 recoverable:(BOOL)recoverable | |
| 108 callback:(SSLErrorCallback)shouldContinue { | |
| 109 // Nothing, yet. | |
| 110 } | |
| 111 | |
| 112 - (void)certificateUsed:(net::X509Certificate*)certificate | 100 - (void)certificateUsed:(net::X509Certificate*)certificate |
| 113 forHost:(const std::string&)host | 101 forHost:(const std::string&)host |
| 114 status:(net::CertStatus)status { | 102 status:(net::CertStatus)status { |
| 115 // Nothing, yet. | 103 // Nothing, yet. |
| 116 } | 104 } |
| 117 | 105 |
| 118 - (void)clearCertificates { | 106 - (void)clearCertificates { |
| 119 // Nothing, yet. | 107 // Nothing, yet. |
| 120 } | 108 } |
| 121 | 109 |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 base::Bind(&TwoStartsSSLCallback, | 492 base::Bind(&TwoStartsSSLCallback, |
| 505 &request_0_called)); | 493 &request_0_called)); |
| 506 tracker_->OnSSLCertificateError(GetSecureRequest(1), ssl_info, true, | 494 tracker_->OnSSLCertificateError(GetSecureRequest(1), ssl_info, true, |
| 507 base::Bind(&TwoStartsSSLCallback, | 495 base::Bind(&TwoStartsSSLCallback, |
| 508 &request_1_called)); | 496 &request_1_called)); |
| 509 EXPECT_TRUE(request_0_called); | 497 EXPECT_TRUE(request_0_called); |
| 510 EXPECT_TRUE(request_1_called); | 498 EXPECT_TRUE(request_1_called); |
| 511 } | 499 } |
| 512 | 500 |
| 513 } // namespace | 501 } // namespace |
| OLD | NEW |