| 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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 | 258 |
| 259 // At this point, the |entries| is full of empty scoped_ptrs, so it can be | 259 // At this point, the |entries| is full of empty scoped_ptrs, so it can be |
| 260 // cleared out safely. | 260 // cleared out safely. |
| 261 entries->clear(); | 261 entries->clear(); |
| 262 | 262 |
| 263 // And finish the restore. | 263 // And finish the restore. |
| 264 FinishRestore(selected_navigation, type); | 264 FinishRestore(selected_navigation, type); |
| 265 } | 265 } |
| 266 | 266 |
| 267 void NavigationControllerImpl::Reload(bool check_for_repost) { | 267 void NavigationControllerImpl::Reload(bool check_for_repost) { |
| 268 ReloadType type = ReloadType::NORMAL; | 268 ReloadInternal(check_for_repost, ReloadType::MAIN_RESOURCE); |
| 269 if (base::FeatureList::IsEnabled( | |
| 270 features::kNonValidatingReloadOnNormalReload)) { | |
| 271 type = ReloadType::MAIN_RESOURCE; | |
| 272 } | |
| 273 ReloadInternal(check_for_repost, type); | |
| 274 } | 269 } |
| 275 void NavigationControllerImpl::ReloadToRefreshContent(bool check_for_repost) { | 270 void NavigationControllerImpl::ReloadToRefreshContent(bool check_for_repost) { |
| 276 ReloadInternal(check_for_repost, ReloadType::MAIN_RESOURCE); | 271 ReloadInternal(check_for_repost, ReloadType::MAIN_RESOURCE); |
| 277 } | 272 } |
| 278 void NavigationControllerImpl::ReloadBypassingCache(bool check_for_repost) { | 273 void NavigationControllerImpl::ReloadBypassingCache(bool check_for_repost) { |
| 279 ReloadInternal(check_for_repost, ReloadType::BYPASSING_CACHE); | 274 ReloadInternal(check_for_repost, ReloadType::BYPASSING_CACHE); |
| 280 } | 275 } |
| 281 void NavigationControllerImpl::ReloadOriginalRequestURL(bool check_for_repost) { | 276 void NavigationControllerImpl::ReloadOriginalRequestURL(bool check_for_repost) { |
| 282 ReloadInternal(check_for_repost, ReloadType::ORIGINAL_REQUEST_URL); | 277 ReloadInternal(check_for_repost, ReloadType::ORIGINAL_REQUEST_URL); |
| 283 } | 278 } |
| (...skipping 1801 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2085 } | 2080 } |
| 2086 } | 2081 } |
| 2087 } | 2082 } |
| 2088 | 2083 |
| 2089 void NavigationControllerImpl::SetGetTimestampCallbackForTest( | 2084 void NavigationControllerImpl::SetGetTimestampCallbackForTest( |
| 2090 const base::Callback<base::Time()>& get_timestamp_callback) { | 2085 const base::Callback<base::Time()>& get_timestamp_callback) { |
| 2091 get_timestamp_callback_ = get_timestamp_callback; | 2086 get_timestamp_callback_ = get_timestamp_callback; |
| 2092 } | 2087 } |
| 2093 | 2088 |
| 2094 } // namespace content | 2089 } // namespace content |
| OLD | NEW |