| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 4442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4453 // dependencies (crbug.com/392171 DownloadRequestHandle, SaveFileManager, | 4453 // dependencies (crbug.com/392171 DownloadRequestHandle, SaveFileManager, |
| 4454 // ResourceDispatcherHostImpl, MediaStreamUIProxy, | 4454 // ResourceDispatcherHostImpl, MediaStreamUIProxy, |
| 4455 // SpeechRecognitionDispatcherHost and possibly others). They look up the view | 4455 // SpeechRecognitionDispatcherHost and possibly others). They look up the view |
| 4456 // based on the ID stored in the resource requests. Once those dependencies | 4456 // based on the ID stored in the resource requests. Once those dependencies |
| 4457 // are unwound or moved to RenderFrameHost (crbug.com/304341) we can move the | 4457 // are unwound or moved to RenderFrameHost (crbug.com/304341) we can move the |
| 4458 // client to be based on the routing_id of the RenderFrameHost. | 4458 // client to be based on the routing_id of the RenderFrameHost. |
| 4459 params.render_view_routing_id = render_view_->routing_id(); | 4459 params.render_view_routing_id = render_view_->routing_id(); |
| 4460 params.socket_address.set_host(response.remoteIPAddress().utf8()); | 4460 params.socket_address.set_host(response.remoteIPAddress().utf8()); |
| 4461 params.socket_address.set_port(response.remotePort()); | 4461 params.socket_address.set_port(response.remotePort()); |
| 4462 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response); | 4462 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response); |
| 4463 if (extra_data) | 4463 if (extra_data) { |
| 4464 params.was_fetched_via_proxy = extra_data->was_fetched_via_proxy(); | 4464 params.was_fetched_via_proxy = extra_data->was_fetched_via_proxy(); |
| 4465 params.used_data_reduction_proxy = extra_data->used_data_reduction_proxy(); |
| 4466 params.is_using_lofi = extra_data->is_using_lofi(); |
| 4467 } |
| 4465 params.was_within_same_page = navigation_state->WasWithinSamePage(); | 4468 params.was_within_same_page = navigation_state->WasWithinSamePage(); |
| 4466 params.security_info = response.securityInfo(); | 4469 params.security_info = response.securityInfo(); |
| 4467 | 4470 |
| 4468 // Set the origin of the frame. This will be replicated to the corresponding | 4471 // Set the origin of the frame. This will be replicated to the corresponding |
| 4469 // RenderFrameProxies in other processes. | 4472 // RenderFrameProxies in other processes. |
| 4470 // TODO(alexmos): Origins for URLs with non-standard schemes are excluded due | 4473 // TODO(alexmos): Origins for URLs with non-standard schemes are excluded due |
| 4471 // to https://crbug.com/439608 and will be replicated as unique origins. | 4474 // to https://crbug.com/439608 and will be replicated as unique origins. |
| 4472 if (!is_swapped_out_) { | 4475 if (!is_swapped_out_) { |
| 4473 std::string scheme = frame->document().securityOrigin().protocol().utf8(); | 4476 std::string scheme = frame->document().securityOrigin().protocol().utf8(); |
| 4474 if (url::IsStandard(scheme.c_str(), | 4477 if (url::IsStandard(scheme.c_str(), |
| (...skipping 1651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6126 int match_count, | 6129 int match_count, |
| 6127 int ordinal, | 6130 int ordinal, |
| 6128 const WebRect& selection_rect, | 6131 const WebRect& selection_rect, |
| 6129 bool final_status_update) { | 6132 bool final_status_update) { |
| 6130 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6133 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
| 6131 selection_rect, ordinal, | 6134 selection_rect, ordinal, |
| 6132 final_status_update)); | 6135 final_status_update)); |
| 6133 } | 6136 } |
| 6134 | 6137 |
| 6135 } // namespace content | 6138 } // namespace content |
| OLD | NEW |