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

chrome/browser/browser.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/browser.h"
 
 #include <algorithm>
 #include <string>
 
 #include "app/animation.h"
@@ skipping 806 matching lines @@
     } else {
       // Default disposition is CURRENT_TAB.
       controller = &GetSelectedTabContents()->controller();
     }
     controller->GoForward();
   }
 }
 
 void Browser::Reload() {
   UserMetrics::RecordAction("Reload", profile_);
+  ReloadInternal(false);
+}
 
+void Browser::ReloadIgnoringCache() {
+  UserMetrics::RecordAction("ReloadIgnoringCache", profile_);
+  ReloadInternal(true);
+}
+
+void Browser::ReloadInternal(bool ignore_cache) {
   // If we are showing an interstitial, treat this as an OpenURL.
   TabContents* current_tab = GetSelectedTabContents();
   if (current_tab) {
     if (current_tab->showing_interstitial_page()) {
       NavigationEntry* entry = current_tab->controller().GetActiveEntry();
       DCHECK(entry);  // Should exist if interstitial is showing.
       OpenURL(entry->url(), GURL(), CURRENT_TAB, PageTransition::RELOAD);
       return;
     }
 
     // As this is caused by a user action, give the focus to the page.
     if (!current_tab->FocusLocationBarByDefault())
       current_tab->Focus();
-    current_tab->controller().Reload(true);
+    if (ignore_cache)
+      current_tab->controller().ReloadIgnoringCache(true);
+    else
+      current_tab->controller().Reload(true);
   }
 }
 
 void Browser::Home(WindowOpenDisposition disposition) {
   UserMetrics::RecordAction("Home", profile_);
   OpenURL(GetHomePage(), GURL(), disposition, PageTransition::AUTO_BOOKMARK);
 }
 
 void Browser::OpenCurrentURL() {
   UserMetrics::RecordAction("LoadURL", profile_);
@@ skipping 610 matching lines @@
     return;
   }
 
   // The order of commands in this switch statement must match the function
   // declaration order in browser.h!
   switch (id) {
     // Navigation commands
     case IDC_BACK:                  GoBack(disposition);           break;
     case IDC_FORWARD:               GoForward(disposition);        break;
     case IDC_RELOAD:                Reload();                      break;
+    case IDC_RELOAD_IGNORING_CACHE: ReloadIgnoringCache();         break;
     case IDC_HOME:                  Home(disposition);             break;
     case IDC_OPEN_CURRENT_URL:      OpenCurrentURL();              break;
     case IDC_GO:                    Go(disposition);               break;
     case IDC_STOP:                  Stop();                        break;
 
      // Window management commands
     case IDC_NEW_WINDOW:            NewWindow();                   break;
     case IDC_NEW_INCOGNITO_WINDOW:  NewIncognitoWindow();          break;
     case IDC_NEW_WINDOW_PROFILE_0:
     case IDC_NEW_WINDOW_PROFILE_1:
@@ skipping 1020 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Command and state updating (private):
 
 void Browser::InitCommandState() {
   // All browser commands whose state isn't set automagically some other way
   // (like Back & Forward with initial page load) must have their state
   // initialized here, otherwise they will be forever disabled.
 
   // Navigation commands
   command_updater_.UpdateCommandEnabled(IDC_RELOAD, true);
+  command_updater_.UpdateCommandEnabled(IDC_RELOAD_IGNORING_CACHE, true);
 
   // Window management commands
   command_updater_.UpdateCommandEnabled(IDC_NEW_WINDOW, true);
   command_updater_.UpdateCommandEnabled(IDC_NEW_INCOGNITO_WINDOW, true);
   // TODO(pkasting): Perhaps the code that populates this submenu should do
   // this?
   command_updater_.UpdateCommandEnabled(IDC_NEW_WINDOW_PROFILE_0, true);
   command_updater_.UpdateCommandEnabled(IDC_NEW_WINDOW_PROFILE_1, true);
   command_updater_.UpdateCommandEnabled(IDC_NEW_WINDOW_PROFILE_2, true);
   command_updater_.UpdateCommandEnabled(IDC_NEW_WINDOW_PROFILE_3, true);
@@ skipping 171 matching lines @@
 
   command_updater_.UpdateCommandEnabled(IDC_SAVE_PAGE,
       SavePackage::IsSavableURL(savable_url));
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_MENU,
       SavePackage::IsSavableContents(current_tab->contents_mime_type()) &&
       SavePackage::IsSavableURL(savable_url));
 
   // Disable certain items if running DevTools
   command_updater_.UpdateCommandEnabled(IDC_RELOAD,
                                         CanReloadContents(current_tab));
+  command_updater_.UpdateCommandEnabled(IDC_RELOAD_IGNORING_CACHE,
+                                        CanReloadContents(current_tab));
   bool enabled_for_non_devtools = type() != TYPE_DEVTOOLS;
   command_updater_.UpdateCommandEnabled(IDC_FIND, enabled_for_non_devtools);
   command_updater_.UpdateCommandEnabled(IDC_FIND_NEXT,
                                         enabled_for_non_devtools);
   command_updater_.UpdateCommandEnabled(IDC_FIND_PREVIOUS,
                                         enabled_for_non_devtools);
   command_updater_.UpdateCommandEnabled(IDC_COPY_URL,
                                         enabled_for_non_devtools);
 
   // Show various bits of UI
@@ skipping 569 matching lines @@
     return;
 
   ExtensionsService* extension_service = profile()->GetExtensionsService();
   if (extension_service && extension_service->is_ready()) {
     Extension* extension =
         extension_service->GetExtensionById(app_extension_id, false);
     if (extension)
       contents->SetAppExtension(extension);
   }
 }