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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 DevToolsNetLogObserver::PopulateResponseInfo(request_, response); | 170 DevToolsNetLogObserver::PopulateResponseInfo(request_, response); |
171 | 171 |
172 HostZoomMap* host_zoom_map = | 172 HostZoomMap* host_zoom_map = |
173 GetHostZoomMapForResourceContext(resource_context); | 173 GetHostZoomMapForResourceContext(resource_context); |
174 | 174 |
175 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_); | 175 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_); |
176 if (info->GetResourceType() == ResourceType::MAIN_FRAME && host_zoom_map) { | 176 if (info->GetResourceType() == ResourceType::MAIN_FRAME && host_zoom_map) { |
177 const GURL& request_url = request_->url(); | 177 const GURL& request_url = request_->url(); |
178 filter_->Send(new ViewMsg_SetZoomLevelForLoadingURL( | 178 filter_->Send(new ViewMsg_SetZoomLevelForLoadingURL( |
179 info->GetRouteID(), | 179 info->GetRouteID(), |
180 request_url, host_zoom_map->GetZoomLevel(net::GetHostOrSpecFromURL( | 180 request_url, host_zoom_map->GetZoomLevel( |
181 request_url)))); | 181 request_url.scheme(), |
| 182 net::GetHostOrSpecFromURL(request_url)))); |
182 } | 183 } |
183 | 184 |
184 response->head.request_start = request_->creation_time(); | 185 response->head.request_start = request_->creation_time(); |
185 response->head.response_start = TimeTicks::Now(); | 186 response->head.response_start = TimeTicks::Now(); |
186 filter_->Send(new ResourceMsg_ReceivedResponse( | 187 filter_->Send(new ResourceMsg_ReceivedResponse( |
187 routing_id_, request_id, response->head)); | 188 routing_id_, request_id, response->head)); |
188 sent_received_response_msg_ = true; | 189 sent_received_response_msg_ = true; |
189 | 190 |
190 if (request_->response_info().metadata) { | 191 if (request_->response_info().metadata) { |
191 std::vector<char> copy(request_->response_info().metadata->data(), | 192 std::vector<char> copy(request_->response_info().metadata->data(), |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
336 } | 337 } |
337 | 338 |
338 void AsyncResourceHandler::ResumeIfDeferred() { | 339 void AsyncResourceHandler::ResumeIfDeferred() { |
339 if (did_defer_) { | 340 if (did_defer_) { |
340 did_defer_ = false; | 341 did_defer_ = false; |
341 controller()->Resume(); | 342 controller()->Resume(); |
342 } | 343 } |
343 } | 344 } |
344 | 345 |
345 } // namespace content | 346 } // namespace content |
OLD | NEW |