Pull to refresh: Use new reload type RELOAD_MAIN_RESOURCE

content/browser/frame_host/navigation_controller_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  *     (http://www.torchmobile.com/)
  *
@@ skipping 270 matching lines @@
   entries->clear();
 
   // And finish the restore.
   FinishRestore(selected_navigation, type);
 }
 
 void NavigationControllerImpl::Reload(bool check_for_repost) {
   ReloadInternal(check_for_repost, RELOAD);
 }
 void NavigationControllerImpl::ReloadToRefreshContent(bool check_for_repost) {
+  ReloadType type = RELOAD;
   if (base::FeatureList::IsEnabled(
         features::kNonValidatingReloadOnRefreshContent)) {
-    // Cause this reload to behave like NAVIGATION_TYPE_SAME_PAGE (e.g., enter
-    // in the omnibox), so that the main resource is cache-validated but all
-    // other resources use the cache as much as possible.  This requires
-    // navigating to the current URL in a new pending entry.
-    // TODO(toyoshim): Introduce a new ReloadType for this behavior if it
-    // becomes the default.
-    NavigationEntryImpl* last_committed = GetLastCommittedEntry();
-
-    // If the last committed entry does not exist, or a repost check dialog is
-    // really needed, use a standard reload instead.
-    if (last_committed &&
-        !(check_for_repost && last_committed->GetHasPostData())) {
-      LoadURL(last_committed->GetURL(), last_committed->GetReferrer(),
-              last_committed->GetTransitionType(),
-              last_committed->extra_headers());
-      return;
-    }
+    type = RELOAD_MAIN_RESOURCE;
   }
-  ReloadInternal(check_for_repost, RELOAD);
+  ReloadInternal(check_for_repost, type);
 }
 void NavigationControllerImpl::ReloadBypassingCache(bool check_for_repost) {
   ReloadInternal(check_for_repost, RELOAD_BYPASSING_CACHE);
 }
 void NavigationControllerImpl::ReloadOriginalRequestURL(bool check_for_repost) {
   ReloadInternal(check_for_repost, RELOAD_ORIGINAL_REQUEST_URL);
 }
 void NavigationControllerImpl::ReloadDisableLoFi(bool check_for_repost) {
   ReloadInternal(check_for_repost, RELOAD_DISABLE_LOFI_MODE);
 }
@@ skipping 1748 matching lines @@
     }
   }
 }
 
 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
     const base::Callback<base::Time()>& get_timestamp_callback) {
   get_timestamp_callback_ = get_timestamp_callback;
 }
 
 }  // namespace content