Plumb shift-reload down into newly-added shift-reload API.

chrome/browser/tab_contents/navigation_controller.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
 #define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
 
 #include "build/build_config.h"
 
 #include <string>
@@ skipping 115 matching lines @@
   // Details sent for NOTIFY_NAV_LIST_PRUNED.
   struct PrunedDetails {
     // If true, count items were removed from the front of the list, otherwise
     // count items were removed from the back of the list.
     bool from_front;
 
     // Number of items removed.
     int count;
   };
 
+  enum ReloadType {
+    NO_RELOAD,                // Normal load.
+    RELOAD_VALIDATING_CACHE,  // Normal reload.
+    RELOAD_IGNORING_CACHE     // Reload all subresources, aka shift-reload.
+  };
+
   // ---------------------------------------------------------------------------
 
   NavigationController(TabContents* tab_contents, Profile* profile);
   ~NavigationController();
 
   // Returns the profile for this controller. It can never be NULL.
   Profile* profile() const {
     return profile_;
   }
 
@@ skipping 133 matching lines @@
   void GoToIndex(int index);
 
   // Navigates to the specified offset from the "current entry". Does nothing if
   // the offset is out of bounds.
   void GoToOffset(int offset);
 
   // Reloads the current entry. If |check_for_repost| is true and the current
   // entry has POST data the user is prompted to see if they really want to
   // reload the page. In nearly all cases pass in true.
   void Reload(bool check_for_repost);
+  // Like Reload(), but don't use caches (aka "shift-reload").
+  void ReloadIgnoringCache(bool check_for_repost);
 
   // Removing of entries -------------------------------------------------------
 
   // Removes the entry at the specified |index|.  This call dicards any pending
   // and transient entries.  |default_url| is the URL that the navigation
   // controller navigates to if there are no more entries after the removal.
   // If |default_url| is empty, we default to "about:blank".
   void RemoveEntryAtIndex(int index, const GURL& default_url);
 
   // TabContents ---------------------------------------------------------------
@@ skipping 125 matching lines @@
       const ViewHostMsg_FrameNavigate_Params& params);
   void RendererDidNavigateToSamePage(
       const ViewHostMsg_FrameNavigate_Params& params);
   void RendererDidNavigateInPage(
       const ViewHostMsg_FrameNavigate_Params& params, bool* did_replace_entry);
   void RendererDidNavigateNewSubframe(
       const ViewHostMsg_FrameNavigate_Params& params);
   bool RendererDidNavigateAutoSubframe(
       const ViewHostMsg_FrameNavigate_Params& params);
 
+  // Helper function for code shared between Reload() and ReloadAll().
+  void ReloadInternal(bool check_for_repost, ReloadType reload_type);
+
   // Actually issues the navigation held in pending_entry.
-  void NavigateToPendingEntry(bool reload);
+  void NavigateToPendingEntry(ReloadType reload_type);
 
   // Allows the derived class to issue notifications that a load has been
   // committed. This will fill in the active entry to the details structure.
   //
   // |extra_invalidate_flags| are an additional set of flags (InvalidateTypes)
   // added to the flags sent to the delegate's NotifyNavigationStateChanged.
   void NotifyNavigationEntryCommitted(LoadCommittedDetails* details,
                                       int extra_invalidate_flags);
 
   // Sets the max restored page ID this NavigationController has seen, if it
@@ skipping 97 matching lines @@
   // when testing.
   static bool check_for_repost_;
 
   // The maximum number of entries that a navigation controller can store.
   static size_t max_entry_count_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationController);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_