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 #include "content/browser/loader/async_resource_handler.h" | 5 #include "content/browser/loader/async_resource_handler.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 DevToolsNetLogObserver::PopulateResponseInfo(request_, response); | 177 DevToolsNetLogObserver::PopulateResponseInfo(request_, response); |
178 | 178 |
179 HostZoomMap* host_zoom_map = | 179 HostZoomMap* host_zoom_map = |
180 GetHostZoomMapForResourceContext(resource_context); | 180 GetHostZoomMapForResourceContext(resource_context); |
181 | 181 |
182 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_); | 182 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_); |
183 if (info->GetResourceType() == ResourceType::MAIN_FRAME && host_zoom_map) { | 183 if (info->GetResourceType() == ResourceType::MAIN_FRAME && host_zoom_map) { |
184 const GURL& request_url = request_->url(); | 184 const GURL& request_url = request_->url(); |
185 filter_->Send(new ViewMsg_SetZoomLevelForLoadingURL( | 185 filter_->Send(new ViewMsg_SetZoomLevelForLoadingURL( |
186 info->GetRouteID(), | 186 info->GetRouteID(), |
187 request_url, host_zoom_map->GetZoomLevel(net::GetHostOrSpecFromURL( | 187 request_url, host_zoom_map->GetZoomLevelForHostAndScheme( |
188 request_url)))); | 188 request_url.scheme(), |
| 189 net::GetHostOrSpecFromURL(request_url)))); |
189 } | 190 } |
190 | 191 |
191 response->head.request_start = request_->creation_time(); | 192 response->head.request_start = request_->creation_time(); |
192 response->head.response_start = TimeTicks::Now(); | 193 response->head.response_start = TimeTicks::Now(); |
193 filter_->Send(new ResourceMsg_ReceivedResponse( | 194 filter_->Send(new ResourceMsg_ReceivedResponse( |
194 routing_id_, request_id, response->head)); | 195 routing_id_, request_id, response->head)); |
195 sent_received_response_msg_ = true; | 196 sent_received_response_msg_ = true; |
196 | 197 |
197 if (request_->response_info().metadata) { | 198 if (request_->response_info().metadata) { |
198 std::vector<char> copy(request_->response_info().metadata->data(), | 199 std::vector<char> copy(request_->response_info().metadata->data(), |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
344 } | 345 } |
345 | 346 |
346 void AsyncResourceHandler::ResumeIfDeferred() { | 347 void AsyncResourceHandler::ResumeIfDeferred() { |
347 if (did_defer_) { | 348 if (did_defer_) { |
348 did_defer_ = false; | 349 did_defer_ = false; |
349 controller()->Resume(); | 350 controller()->Resume(); |
350 } | 351 } |
351 } | 352 } |
352 | 353 |
353 } // namespace content | 354 } // namespace content |
OLD | NEW |