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 4473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4484 frame->shouldEnforceStrictMixedContentChecking(); | 4484 frame->shouldEnforceStrictMixedContentChecking(); |
4485 | 4485 |
4486 // Set the URL to be displayed in the browser UI to the user. | 4486 // Set the URL to be displayed in the browser UI to the user. |
4487 params.url = GetLoadingUrl(); | 4487 params.url = GetLoadingUrl(); |
4488 DCHECK(!is_swapped_out_ || params.url == GURL(kSwappedOutURL)); | 4488 DCHECK(!is_swapped_out_ || params.url == GURL(kSwappedOutURL)); |
4489 | 4489 |
4490 if (frame->document().baseURL() != params.url) | 4490 if (frame->document().baseURL() != params.url) |
4491 params.base_url = frame->document().baseURL(); | 4491 params.base_url = frame->document().baseURL(); |
4492 | 4492 |
4493 GetRedirectChain(ds, ¶ms.redirects); | 4493 GetRedirectChain(ds, ¶ms.redirects); |
4494 params.should_update_history = !ds->hasUnreachableURL() && | 4494 params.should_update_history = |
4495 !response.isMultipartPayload() && (response.httpStatusCode() != 404); | 4495 !ds->hasUnreachableURL() && response.httpStatusCode() != 404; |
4496 | 4496 |
4497 params.searchable_form_url = internal_data->searchable_form_url(); | 4497 params.searchable_form_url = internal_data->searchable_form_url(); |
4498 params.searchable_form_encoding = internal_data->searchable_form_encoding(); | 4498 params.searchable_form_encoding = internal_data->searchable_form_encoding(); |
4499 | 4499 |
4500 params.gesture = render_view_->navigation_gesture_; | 4500 params.gesture = render_view_->navigation_gesture_; |
4501 render_view_->navigation_gesture_ = NavigationGestureUnknown; | 4501 render_view_->navigation_gesture_ = NavigationGestureUnknown; |
4502 | 4502 |
4503 // Make navigation state a part of the DidCommitProvisionalLoad message so | 4503 // Make navigation state a part of the DidCommitProvisionalLoad message so |
4504 // that committed entry has it at all times. | 4504 // that committed entry has it at all times. |
4505 int64_t post_id = -1; | 4505 int64_t post_id = -1; |
(...skipping 1626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6132 int match_count, | 6132 int match_count, |
6133 int ordinal, | 6133 int ordinal, |
6134 const WebRect& selection_rect, | 6134 const WebRect& selection_rect, |
6135 bool final_status_update) { | 6135 bool final_status_update) { |
6136 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6136 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
6137 selection_rect, ordinal, | 6137 selection_rect, ordinal, |
6138 final_status_update)); | 6138 final_status_update)); |
6139 } | 6139 } |
6140 | 6140 |
6141 } // namespace content | 6141 } // namespace content |
OLD | NEW |