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 4464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4475 | 4475 |
4476 // Set the URL to be displayed in the browser UI to the user. | 4476 // Set the URL to be displayed in the browser UI to the user. |
4477 params.url = GetLoadingUrl(); | 4477 params.url = GetLoadingUrl(); |
4478 DCHECK(!is_swapped_out_ || params.url == GURL(kSwappedOutURL)); | 4478 DCHECK(!is_swapped_out_ || params.url == GURL(kSwappedOutURL)); |
4479 | 4479 |
4480 if (frame->document().baseURL() != params.url) | 4480 if (frame->document().baseURL() != params.url) |
4481 params.base_url = frame->document().baseURL(); | 4481 params.base_url = frame->document().baseURL(); |
4482 | 4482 |
4483 GetRedirectChain(ds, ¶ms.redirects); | 4483 GetRedirectChain(ds, ¶ms.redirects); |
4484 params.should_update_history = !ds->hasUnreachableURL() && | 4484 params.should_update_history = !ds->hasUnreachableURL() && |
4485 !response.isMultipartPayload() && (response.httpStatusCode() != 404); | 4485 (response.httpStatusCode() != 404); |
Tom Sepez
2016/03/04 17:51:10
nit: overparenthesized.
yhirano
2016/03/08 18:40:41
Done.
| |
4486 | 4486 |
4487 params.searchable_form_url = internal_data->searchable_form_url(); | 4487 params.searchable_form_url = internal_data->searchable_form_url(); |
4488 params.searchable_form_encoding = internal_data->searchable_form_encoding(); | 4488 params.searchable_form_encoding = internal_data->searchable_form_encoding(); |
4489 | 4489 |
4490 params.gesture = render_view_->navigation_gesture_; | 4490 params.gesture = render_view_->navigation_gesture_; |
4491 render_view_->navigation_gesture_ = NavigationGestureUnknown; | 4491 render_view_->navigation_gesture_ = NavigationGestureUnknown; |
4492 | 4492 |
4493 // Make navigation state a part of the DidCommitProvisionalLoad message so | 4493 // Make navigation state a part of the DidCommitProvisionalLoad message so |
4494 // that committed entry has it at all times. | 4494 // that committed entry has it at all times. |
4495 int64_t post_id = -1; | 4495 int64_t post_id = -1; |
(...skipping 1614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6110 int match_count, | 6110 int match_count, |
6111 int ordinal, | 6111 int ordinal, |
6112 const WebRect& selection_rect, | 6112 const WebRect& selection_rect, |
6113 bool final_status_update) { | 6113 bool final_status_update) { |
6114 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6114 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
6115 selection_rect, ordinal, | 6115 selection_rect, ordinal, |
6116 final_status_update)); | 6116 final_status_update)); |
6117 } | 6117 } |
6118 | 6118 |
6119 } // namespace content | 6119 } // namespace content |
OLD | NEW |