OLD | NEW |
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 #ifndef CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_ | 5 #ifndef CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_ |
6 #define CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_ | 6 #define CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_ |
7 | 7 |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "base/timer/timer.h" |
10 #include "content/browser/loader/resource_handler.h" | 11 #include "content/browser/loader/resource_handler.h" |
11 #include "content/browser/ssl/ssl_client_auth_handler.h" | 12 #include "content/browser/ssl/ssl_client_auth_handler.h" |
12 #include "content/browser/ssl/ssl_error_handler.h" | 13 #include "content/browser/ssl/ssl_error_handler.h" |
13 #include "content/common/content_export.h" | 14 #include "content/common/content_export.h" |
14 #include "content/public/browser/resource_controller.h" | 15 #include "content/public/browser/resource_controller.h" |
15 #include "content/public/common/signed_certificate_timestamp_id_and_status.h" | 16 #include "content/public/common/signed_certificate_timestamp_id_and_status.h" |
16 #include "net/url_request/url_request.h" | 17 #include "net/url_request/url_request.h" |
17 | 18 |
18 namespace net { | 19 namespace net { |
19 class X509Certificate; | 20 class X509Certificate; |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 uint64 last_upload_position_; | 139 uint64 last_upload_position_; |
139 bool waiting_for_upload_progress_ack_; | 140 bool waiting_for_upload_progress_ack_; |
140 base::TimeTicks last_upload_ticks_; | 141 base::TimeTicks last_upload_ticks_; |
141 base::TimeTicks read_deferral_start_time_; | 142 base::TimeTicks read_deferral_start_time_; |
142 | 143 |
143 // Indicates that we are in a state of being transferred to a new downstream | 144 // Indicates that we are in a state of being transferred to a new downstream |
144 // consumer. We are waiting for a notification to complete the transfer, at | 145 // consumer. We are waiting for a notification to complete the transfer, at |
145 // which point we'll receive a new ResourceHandler. | 146 // which point we'll receive a new ResourceHandler. |
146 bool is_transferring_; | 147 bool is_transferring_; |
147 | 148 |
| 149 base::RepeatingTimer<ResourceLoader> progress_timer_; |
| 150 |
148 base::WeakPtrFactory<ResourceLoader> weak_ptr_factory_; | 151 base::WeakPtrFactory<ResourceLoader> weak_ptr_factory_; |
149 | 152 |
150 DISALLOW_COPY_AND_ASSIGN(ResourceLoader); | 153 DISALLOW_COPY_AND_ASSIGN(ResourceLoader); |
151 }; | 154 }; |
152 | 155 |
153 } // namespace content | 156 } // namespace content |
154 | 157 |
155 #endif // CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_ | 158 #endif // CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_ |
OLD | NEW |