| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "content/browser/frame_host/frame_tree.h" | 8 #include "content/browser/frame_host/frame_tree.h" |
| 9 #include "content/browser/frame_host/frame_tree_node.h" | 9 #include "content/browser/frame_host/frame_tree_node.h" |
| 10 #include "content/browser/frame_host/navigation_controller_impl.h" | 10 #include "content/browser/frame_host/navigation_controller_impl.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 controller_->GetBrowserContext())); | 70 controller_->GetBrowserContext())); |
| 71 entry->set_site_instance( | 71 entry->set_site_instance( |
| 72 static_cast<SiteInstanceImpl*>( | 72 static_cast<SiteInstanceImpl*>( |
| 73 render_frame_host->render_view_host()->GetSiteInstance())); | 73 render_frame_host->render_view_host()->GetSiteInstance())); |
| 74 // TODO(creis): If there's a pending entry already, find a safe way to | 74 // TODO(creis): If there's a pending entry already, find a safe way to |
| 75 // update it instead of replacing it and copying over things like this. | 75 // update it instead of replacing it and copying over things like this. |
| 76 if (pending_entry) { | 76 if (pending_entry) { |
| 77 entry->set_transferred_global_request_id( | 77 entry->set_transferred_global_request_id( |
| 78 pending_entry->transferred_global_request_id()); | 78 pending_entry->transferred_global_request_id()); |
| 79 entry->set_should_replace_entry(pending_entry->should_replace_entry()); | 79 entry->set_should_replace_entry(pending_entry->should_replace_entry()); |
| 80 entry->set_redirect_chain(pending_entry->redirect_chain()); | 80 entry->SetRedirectChain(pending_entry->GetRedirectChain()); |
| 81 } | 81 } |
| 82 controller_->SetPendingEntry(entry); | 82 controller_->SetPendingEntry(entry); |
| 83 if (delegate_) | 83 if (delegate_) |
| 84 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); | 84 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); |
| 85 } | 85 } |
| 86 } | 86 } |
| 87 | 87 |
| 88 if (delegate_) { | 88 if (delegate_) { |
| 89 // Notify the observer about the start of the provisional load. | 89 // Notify the observer about the start of the provisional load. |
| 90 delegate_->DidStartProvisionalLoad( | 90 delegate_->DidStartProvisionalLoad( |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 render_frame_host->GetSiteInstance(), page_id); | 175 render_frame_host->GetSiteInstance(), page_id); |
| 176 } | 176 } |
| 177 if (!entry || entry->GetURL() != validated_source_url) | 177 if (!entry || entry->GetURL() != validated_source_url) |
| 178 return; | 178 return; |
| 179 | 179 |
| 180 delegate_->DidRedirectProvisionalLoad( | 180 delegate_->DidRedirectProvisionalLoad( |
| 181 render_frame_host, validated_target_url); | 181 render_frame_host, validated_target_url); |
| 182 } | 182 } |
| 183 | 183 |
| 184 } // namespace content | 184 } // namespace content |
| OLD | NEW |