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/browser/frame_host/render_frame_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 2696 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2707 // the URL bar correctly displays privileged URLs instead of filtering them. | 2707 // the URL bar correctly displays privileged URLs instead of filtering them. |
2708 UpdatePermissionsForNavigation(common_params, request_params); | 2708 UpdatePermissionsForNavigation(common_params, request_params); |
2709 | 2709 |
2710 // Get back to a clean state, in case a new navigation started without | 2710 // Get back to a clean state, in case a new navigation started without |
2711 // completing an unload handler. | 2711 // completing an unload handler. |
2712 ResetWaitingState(); | 2712 ResetWaitingState(); |
2713 | 2713 |
2714 Send(new FrameMsg_FailedNavigation(routing_id_, common_params, request_params, | 2714 Send(new FrameMsg_FailedNavigation(routing_id_, common_params, request_params, |
2715 has_stale_copy_in_cache, error_code)); | 2715 has_stale_copy_in_cache, error_code)); |
2716 | 2716 |
| 2717 RenderFrameDevToolsAgentHost::OnFailedNavigation( |
| 2718 this, static_cast<net::Error>(error_code)); |
| 2719 |
2717 // An error page is expected to commit, hence why is_loading_ is set to true. | 2720 // An error page is expected to commit, hence why is_loading_ is set to true. |
2718 is_loading_ = true; | 2721 is_loading_ = true; |
2719 frame_tree_node_->ResetNavigationRequest(true); | 2722 frame_tree_node_->ResetNavigationRequest(true); |
2720 } | 2723 } |
2721 | 2724 |
2722 void RenderFrameHostImpl::SetUpMojoIfNeeded() { | 2725 void RenderFrameHostImpl::SetUpMojoIfNeeded() { |
2723 if (interface_registry_.get()) | 2726 if (interface_registry_.get()) |
2724 return; | 2727 return; |
2725 | 2728 |
2726 interface_registry_ = base::MakeUnique<service_manager::InterfaceRegistry>( | 2729 interface_registry_ = base::MakeUnique<service_manager::InterfaceRegistry>( |
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3447 // There is no pending NavigationEntry in these cases, so pass 0 as the | 3450 // There is no pending NavigationEntry in these cases, so pass 0 as the |
3448 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3451 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
3449 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3452 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
3450 return NavigationHandleImpl::Create( | 3453 return NavigationHandleImpl::Create( |
3451 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, | 3454 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, |
3452 params.was_within_same_page, base::TimeTicks::Now(), | 3455 params.was_within_same_page, base::TimeTicks::Now(), |
3453 entry_id_for_data_nav, false); // started_from_context_menu | 3456 entry_id_for_data_nav, false); // started_from_context_menu |
3454 } | 3457 } |
3455 | 3458 |
3456 } // namespace content | 3459 } // namespace content |
OLD | NEW |