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

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/tab_contents/tab_contents.h"
 
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/auto_reset.h"
@@ skipping 168 matching lines @@
 
 BOOL CALLBACK InvalidateWindow(HWND hwnd, LPARAM lparam) {
   // Note: erase is required to properly paint some widgets borders. This can
   // be seen with textfields.
   InvalidateRect(hwnd, NULL, TRUE);
   return TRUE;
 }
 #endif
 
 ViewMsg_Navigate_Params::NavigationType GetNavigationType(
-    Profile* profile, const NavigationEntry& entry, bool reload) {
-  if (reload)
-    return ViewMsg_Navigate_Params::RELOAD;
+    Profile* profile, const NavigationEntry& entry,
+    NavigationController::ReloadType reload_type) {
+  switch (reload_type) {
+    case NavigationController::RELOAD_VALIDATING_CACHE:

[darin (slow to review), 2010/02/18 22:55:42]

nit: maybe you should just stick with RELOAD / RELOAD_IGNORING_CACHE everywhere
instead of sometimes using RELOAD_VALIDATING_CACHE to mean the same thing as
RELOAD?

+      return ViewMsg_Navigate_Params::RELOAD;
+    case NavigationController::RELOAD_IGNORING_CACHE:
+      return ViewMsg_Navigate_Params::RELOAD_IGNORING_CACHE;
+    case NavigationController::NO_RELOAD:
+      break;  // Fall through to rest of function.
+  }
 
   if (entry.restore_type() == NavigationEntry::RESTORE_LAST_SESSION &&
       profile->DidLastSessionExitCleanly())
     return ViewMsg_Navigate_Params::RESTORE;
 
   return ViewMsg_Navigate_Params::NORMAL;
 }
 
 void MakeNavigateParams(Profile* profile, const NavigationEntry& entry,
-                        bool reload, ViewMsg_Navigate_Params* params) {
+                        NavigationController::ReloadType reload_type,
+                        ViewMsg_Navigate_Params* params) {
   params->page_id = entry.page_id();
   params->url = entry.url();
   params->referrer = entry.referrer();
   params->transition = entry.transition_type();
   params->state = entry.content_state();
-  params->navigation_type = GetNavigationType(profile, entry, reload);
+  params->navigation_type = GetNavigationType(profile, entry, reload_type);
   params->request_time = base::Time::Now();
 }
 
 }  // namespace
 
 // -----------------------------------------------------------------------------
 
 // static
 int TabContents::find_request_id_counter_ = -1;
 
@@ skipping 478 matching lines @@
   WasHidden();
 }
 
 void TabContents::OpenURL(const GURL& url, const GURL& referrer,
                           WindowOpenDisposition disposition,
                           PageTransition::Type transition) {
   if (delegate_)
     delegate_->OpenURLFromTab(this, url, referrer, disposition, transition);
 }
 
-bool TabContents::NavigateToPendingEntry(bool reload) {
+bool TabContents::NavigateToPendingEntry(
+    NavigationController::ReloadType reload_type) {
   const NavigationEntry& entry = *controller_.pending_entry();
 
   RenderViewHost* dest_render_view_host = render_manager_.Navigate(entry);
   if (!dest_render_view_host)
     return false;  // Unable to create the desired render view host.
 
   // Tell DevTools agent that it is attached prior to the navigation.
   DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
   if (devtools_manager) {  // NULL in unit tests.
     devtools_manager->OnNavigatingToPendingEntry(
         render_view_host(),
         dest_render_view_host,
         controller_.pending_entry()->url());
   }
 
   // Used for page load time metrics.
   current_load_start_ = base::TimeTicks::Now();
 
   // Navigate in the desired RenderViewHost.
   ViewMsg_Navigate_Params navigate_params;
-  MakeNavigateParams(profile(), entry, reload, &navigate_params);
+  MakeNavigateParams(profile(), entry, reload_type, &navigate_params);
   dest_render_view_host->Navigate(navigate_params);
 
   if (entry.page_id() == -1) {
     // HACK!!  This code suppresses javascript: URLs from being added to
     // session history, which is what we want to do for javascript: URLs that
     // do not generate content.  What we really need is a message from the
     // renderer telling us that a new page was not created.  The same message
     // could be used for mailto: URLs and the like.
     if (entry.url().SchemeIs(chrome::kJavaScriptScheme))
       return false;
   }
 
   // Clear any provisional password saves - this stops password infobars
   // showing up on pages the user navigates to while the right page is
   // loading.
   GetPasswordManager()->ClearProvisionalSave();
 
-  if (reload && !profile()->IsOffTheRecord()) {
+  if (reload_type != NavigationController::NO_RELOAD &&
+      !profile()->IsOffTheRecord()) {
     FaviconService* favicon_service =
         profile()->GetFaviconService(Profile::IMPLICIT_ACCESS);
     if (favicon_service)
       favicon_service->SetFaviconOutOfDateForPage(entry.url());
   }
 
   return true;
 }
 
 void TabContents::Stop() {
@@ skipping 2093 matching lines @@
   render_view_host()->JavaScriptMessageBoxClosed(reply_msg, success, prompt);
 }
 
 void TabContents::SetSuppressMessageBoxes(bool suppress_message_boxes) {
   set_suppress_javascript_messages(suppress_message_boxes);
 }
 
 void TabContents::set_encoding(const std::string& encoding) {
   encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
 }