| 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/navigator_impl.h" | 5 #include "content/browser/frame_host/navigator_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 bool is_renderer_initiated = true; | 185 bool is_renderer_initiated = true; |
| 186 int pending_nav_entry_id = 0; | 186 int pending_nav_entry_id = 0; |
| 187 NavigationEntryImpl* pending_entry = controller_->GetPendingEntry(); | 187 NavigationEntryImpl* pending_entry = controller_->GetPendingEntry(); |
| 188 if (pending_entry) { | 188 if (pending_entry) { |
| 189 is_renderer_initiated = pending_entry->is_renderer_initiated(); | 189 is_renderer_initiated = pending_entry->is_renderer_initiated(); |
| 190 pending_nav_entry_id = pending_entry->GetUniqueID(); | 190 pending_nav_entry_id = pending_entry->GetUniqueID(); |
| 191 } | 191 } |
| 192 render_frame_host->SetNavigationHandle(NavigationHandleImpl::Create( | 192 render_frame_host->SetNavigationHandle(NavigationHandleImpl::Create( |
| 193 validated_url, render_frame_host->frame_tree_node(), | 193 validated_url, render_frame_host->frame_tree_node(), |
| 194 is_renderer_initiated, | 194 is_renderer_initiated, |
| 195 false, // is_synchronous | 195 false, // is_same_page |
| 196 is_iframe_srcdoc, // is_srcdoc | 196 is_iframe_srcdoc, // is_srcdoc |
| 197 navigation_start, pending_nav_entry_id)); | 197 navigation_start, pending_nav_entry_id)); |
| 198 } | 198 } |
| 199 | 199 |
| 200 void NavigatorImpl::DidFailProvisionalLoadWithError( | 200 void NavigatorImpl::DidFailProvisionalLoadWithError( |
| 201 RenderFrameHostImpl* render_frame_host, | 201 RenderFrameHostImpl* render_frame_host, |
| 202 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { | 202 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { |
| 203 VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec() | 203 VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec() |
| 204 << ", error_code: " << params.error_code | 204 << ", error_code: " << params.error_code |
| 205 << ", error_description: " << params.error_description | 205 << ", error_description: " << params.error_description |
| (...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1202 if (pending_entry != controller_->GetVisibleEntry() || | 1202 if (pending_entry != controller_->GetVisibleEntry() || |
| 1203 !should_preserve_entry) { | 1203 !should_preserve_entry) { |
| 1204 controller_->DiscardPendingEntry(true); | 1204 controller_->DiscardPendingEntry(true); |
| 1205 | 1205 |
| 1206 // Also force the UI to refresh. | 1206 // Also force the UI to refresh. |
| 1207 controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); | 1207 controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); |
| 1208 } | 1208 } |
| 1209 } | 1209 } |
| 1210 | 1210 |
| 1211 } // namespace content | 1211 } // namespace content |
| OLD | NEW |