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/renderer_host/sync_resource_handler.h" | 5 #include "content/browser/renderer_host/sync_resource_handler.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "content/browser/debugger/devtools_netlog_observer.h" | 8 #include "content/browser/debugger/devtools_netlog_observer.h" |
9 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h" | 9 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h" |
10 #include "content/browser/renderer_host/resource_message_filter.h" | 10 #include "content/browser/renderer_host/resource_message_filter.h" |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 bool SyncResourceHandler::OnResponseStarted( | 65 bool SyncResourceHandler::OnResponseStarted( |
66 int request_id, | 66 int request_id, |
67 ResourceResponse* response, | 67 ResourceResponse* response, |
68 bool* defer) { | 68 bool* defer) { |
69 if (rdh_->delegate()) | 69 if (rdh_->delegate()) |
70 rdh_->delegate()->OnResponseStarted(request_, response, filter_); | 70 rdh_->delegate()->OnResponseStarted(request_, response, filter_); |
71 | 71 |
72 DevToolsNetLogObserver::PopulateResponseInfo(request_, response); | 72 DevToolsNetLogObserver::PopulateResponseInfo(request_, response); |
73 | 73 |
74 // We don't care about copying the status here. | 74 // We don't care about copying the status here. |
75 result_.headers = response->headers; | 75 result_.headers = response->head.headers; |
76 result_.mime_type = response->mime_type; | 76 result_.mime_type = response->head.mime_type; |
77 result_.charset = response->charset; | 77 result_.charset = response->head.charset; |
78 result_.download_file_path = response->download_file_path; | 78 result_.download_file_path = response->head.download_file_path; |
79 result_.request_time = response->request_time; | 79 result_.request_time = response->head.request_time; |
80 result_.response_time = response->response_time; | 80 result_.response_time = response->head.response_time; |
81 result_.connection_id = response->connection_id; | 81 result_.connection_id = response->head.connection_id; |
82 result_.connection_reused = response->connection_reused; | 82 result_.connection_reused = response->head.connection_reused; |
83 result_.load_timing = response->load_timing; | 83 result_.load_timing = response->head.load_timing; |
84 result_.devtools_info = response->devtools_info; | 84 result_.devtools_info = response->head.devtools_info; |
85 return true; | 85 return true; |
86 } | 86 } |
87 | 87 |
88 bool SyncResourceHandler::OnWillStart(int request_id, | 88 bool SyncResourceHandler::OnWillStart(int request_id, |
89 const GURL& url, | 89 const GURL& url, |
90 bool* defer) { | 90 bool* defer) { |
91 return true; | 91 return true; |
92 } | 92 } |
93 | 93 |
94 bool SyncResourceHandler::OnWillRead(int request_id, net::IOBuffer** buf, | 94 bool SyncResourceHandler::OnWillRead(int request_id, net::IOBuffer** buf, |
(...skipping 21 matching lines...) Expand all Loading... |
116 result_.encoded_data_length = | 116 result_.encoded_data_length = |
117 DevToolsNetLogObserver::GetAndResetEncodedDataLength(request_); | 117 DevToolsNetLogObserver::GetAndResetEncodedDataLength(request_); |
118 | 118 |
119 ResourceHostMsg_SyncLoad::WriteReplyParams(result_message_, result_); | 119 ResourceHostMsg_SyncLoad::WriteReplyParams(result_message_, result_); |
120 filter_->Send(result_message_); | 120 filter_->Send(result_message_); |
121 result_message_ = NULL; | 121 result_message_ = NULL; |
122 return true; | 122 return true; |
123 } | 123 } |
124 | 124 |
125 } // namespace content | 125 } // namespace content |
OLD | NEW |