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 /* | 5 /* |
6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. | 6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. |
7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
9 * (http://www.torchmobile.com/) | 9 * (http://www.torchmobile.com/) |
10 * | 10 * |
(...skipping 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1211 | 1211 |
1212 // TODO(creis): Classify location.replace as NEW_PAGE instead of EXISTING_PAGE | 1212 // TODO(creis): Classify location.replace as NEW_PAGE instead of EXISTING_PAGE |
1213 // in https://crbug.com/596707. | 1213 // in https://crbug.com/596707. |
1214 | 1214 |
1215 NavigationEntryImpl* entry; | 1215 NavigationEntryImpl* entry; |
1216 if (params.intended_as_new_entry) { | 1216 if (params.intended_as_new_entry) { |
1217 // This was intended as a new entry but the pending entry was lost in the | 1217 // This was intended as a new entry but the pending entry was lost in the |
1218 // meanwhile and no new page was created. We are stuck at the last committed | 1218 // meanwhile and no new page was created. We are stuck at the last committed |
1219 // entry. | 1219 // entry. |
1220 entry = GetLastCommittedEntry(); | 1220 entry = GetLastCommittedEntry(); |
1221 CHECK(!is_in_page); | 1221 DCHECK(!is_in_page); |
1222 entry->GetSSL() = handle->ssl_status(); | 1222 entry->GetSSL() = handle->ssl_status(); |
1223 } else if (params.nav_entry_id) { | 1223 } else if (params.nav_entry_id) { |
1224 // This is a browser-initiated navigation (back/forward/reload). | 1224 // This is a browser-initiated navigation (back/forward/reload). |
1225 entry = GetEntryWithUniqueID(params.nav_entry_id); | 1225 entry = GetEntryWithUniqueID(params.nav_entry_id); |
1226 | 1226 |
1227 if (is_in_page) { | 1227 if (is_in_page) { |
1228 // There's no SSLStatus in the NavigationHandle for in-page navigations, | 1228 // There's no SSLStatus in the NavigationHandle for in-page navigations, |
1229 // so normally we leave |entry|'s SSLStatus as is. However if this was a | 1229 // so normally we leave |entry|'s SSLStatus as is. However if this was a |
1230 // restored in-page navigation entry, then it won't have an SSLStatus. So | 1230 // restored in-page navigation entry, then it won't have an SSLStatus. So |
1231 // we need to copy over the SSLStatus from the entry that navigated it. | 1231 // we need to copy over the SSLStatus from the entry that navigated it. |
(...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2155 } | 2155 } |
2156 } | 2156 } |
2157 } | 2157 } |
2158 | 2158 |
2159 void NavigationControllerImpl::SetGetTimestampCallbackForTest( | 2159 void NavigationControllerImpl::SetGetTimestampCallbackForTest( |
2160 const base::Callback<base::Time()>& get_timestamp_callback) { | 2160 const base::Callback<base::Time()>& get_timestamp_callback) { |
2161 get_timestamp_callback_ = get_timestamp_callback; | 2161 get_timestamp_callback_ = get_timestamp_callback; |
2162 } | 2162 } |
2163 | 2163 |
2164 } // namespace content | 2164 } // namespace content |
OLD | NEW |