| 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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 | 278 |
| 279 // At this point, the |entries| is full of empty scoped_ptrs, so it can be | 279 // At this point, the |entries| is full of empty scoped_ptrs, so it can be |
| 280 // cleared out safely. | 280 // cleared out safely. |
| 281 entries->clear(); | 281 entries->clear(); |
| 282 | 282 |
| 283 // And finish the restore. | 283 // And finish the restore. |
| 284 FinishRestore(selected_navigation, type); | 284 FinishRestore(selected_navigation, type); |
| 285 } | 285 } |
| 286 | 286 |
| 287 void NavigationControllerImpl::Reload(bool check_for_repost) { | 287 void NavigationControllerImpl::Reload(bool check_for_repost) { |
| 288 ReloadInternal(check_for_repost, RELOAD); | 288 ReloadType type = RELOAD; |
| 289 if (base::FeatureList::IsEnabled( |
| 290 features::kNonValidatingReloadOnNormalReload)) { |
| 291 type = RELOAD_MAIN_RESOURCE; |
| 292 } |
| 293 ReloadInternal(check_for_repost, type); |
| 289 } | 294 } |
| 290 void NavigationControllerImpl::ReloadToRefreshContent(bool check_for_repost) { | 295 void NavigationControllerImpl::ReloadToRefreshContent(bool check_for_repost) { |
| 291 ReloadType type = RELOAD; | 296 ReloadType type = RELOAD; |
| 292 if (base::FeatureList::IsEnabled( | 297 if (base::FeatureList::IsEnabled( |
| 293 features::kNonValidatingReloadOnRefreshContent)) { | 298 features::kNonValidatingReloadOnRefreshContent)) { |
| 294 type = RELOAD_MAIN_RESOURCE; | 299 type = RELOAD_MAIN_RESOURCE; |
| 295 } | 300 } |
| 296 ReloadInternal(check_for_repost, type); | 301 ReloadInternal(check_for_repost, type); |
| 297 } | 302 } |
| 298 void NavigationControllerImpl::ReloadBypassingCache(bool check_for_repost) { | 303 void NavigationControllerImpl::ReloadBypassingCache(bool check_for_repost) { |
| (...skipping 1756 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2055 } | 2060 } |
| 2056 } | 2061 } |
| 2057 } | 2062 } |
| 2058 | 2063 |
| 2059 void NavigationControllerImpl::SetGetTimestampCallbackForTest( | 2064 void NavigationControllerImpl::SetGetTimestampCallbackForTest( |
| 2060 const base::Callback<base::Time()>& get_timestamp_callback) { | 2065 const base::Callback<base::Time()>& get_timestamp_callback) { |
| 2061 get_timestamp_callback_ = get_timestamp_callback; | 2066 get_timestamp_callback_ = get_timestamp_callback; |
| 2062 } | 2067 } |
| 2063 | 2068 |
| 2064 } // namespace content | 2069 } // namespace content |
| OLD | NEW |