Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Side by Side Diff: content/browser/loader/async_resource_handler.cc

Issue 11866004: Add scheme to HostZoomMap (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Eliminate old methods in interface Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 DevToolsNetLogObserver::PopulateResponseInfo(request_, response); 171 DevToolsNetLogObserver::PopulateResponseInfo(request_, response);
172 172
173 HostZoomMap* host_zoom_map = 173 HostZoomMap* host_zoom_map =
174 GetHostZoomMapForResourceContext(resource_context); 174 GetHostZoomMapForResourceContext(resource_context);
175 175
176 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_); 176 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
177 if (info->GetResourceType() == ResourceType::MAIN_FRAME && host_zoom_map) { 177 if (info->GetResourceType() == ResourceType::MAIN_FRAME && host_zoom_map) {
178 const GURL& request_url = request_->url(); 178 const GURL& request_url = request_->url();
179 filter_->Send(new ViewMsg_SetZoomLevelForLoadingURL( 179 filter_->Send(new ViewMsg_SetZoomLevelForLoadingURL(
180 info->GetRouteID(), 180 info->GetRouteID(),
181 request_url, host_zoom_map->GetZoomLevel(net::GetHostOrSpecFromURL( 181 request_url, host_zoom_map->GetZoomLevel(
182 request_url)))); 182 request_url.scheme(),
183 net::GetHostOrSpecFromURL(request_url))));
183 } 184 }
184 185
185 response->head.request_start = request_->creation_time(); 186 response->head.request_start = request_->creation_time();
186 response->head.response_start = TimeTicks::Now(); 187 response->head.response_start = TimeTicks::Now();
187 filter_->Send(new ResourceMsg_ReceivedResponse( 188 filter_->Send(new ResourceMsg_ReceivedResponse(
188 routing_id_, request_id, response->head)); 189 routing_id_, request_id, response->head));
189 sent_received_response_msg_ = true; 190 sent_received_response_msg_ = true;
190 191
191 if (request_->response_info().metadata) { 192 if (request_->response_info().metadata) {
192 std::vector<char> copy(request_->response_info().metadata->data(), 193 std::vector<char> copy(request_->response_info().metadata->data(),
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 } 339 }
339 340
340 void AsyncResourceHandler::ResumeIfDeferred() { 341 void AsyncResourceHandler::ResumeIfDeferred() {
341 if (did_defer_) { 342 if (did_defer_) {
342 did_defer_ = false; 343 did_defer_ = false;
343 controller()->Resume(); 344 controller()->Resume();
344 } 345 }
345 } 346 }
346 347
347 } // namespace content 348 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698