Rename IGNORING_CACHE to BYPASSING_CACHE

chrome/browser/ui/views/toolbar/reload_button.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.
 
 #include "chrome/browser/ui/views/toolbar/reload_button.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 131 matching lines @@
       command_updater_->ExecuteCommandWithDisposition(IDC_STOP, CURRENT_TAB);
     // The user has clicked, so we can feel free to update the button,
     // even if the mouse is still hovering.
     ChangeMode(MODE_RELOAD, true);
   } else if (!double_click_timer_.IsRunning()) {
     // Shift-clicking or ctrl-clicking the reload button means we should ignore
     // any cached content.
     int command;
     int flags = event.flags();
     if (event.IsShiftDown() || event.IsControlDown()) {
-      command = IDC_RELOAD_IGNORING_CACHE;
+      command = IDC_RELOAD_BYPASSING_CACHE;
       // Mask off Shift and Control so they don't affect the disposition below.
       flags &= ~(ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
     } else {
       command = IDC_RELOAD;
     }
 
     // Start a timer - while this timer is running, the reload button cannot be
     // changed to a stop button.  We do not set |intended_mode_| to MODE_STOP
     // here as the browser will do that when it actually starts loading (which
     // may happen synchronously, thus the need to do this before telling the
@@ skipping 18 matching lines @@
   return true;
 }
 
 bool ReloadButton::GetAcceleratorForCommandId(int command_id,
     ui::Accelerator* accelerator) {
   switch (command_id) {
     case IDS_RELOAD_MENU_NORMAL_RELOAD_ITEM:
       GetWidget()->GetAccelerator(IDC_RELOAD, accelerator);
       return true;
     case IDS_RELOAD_MENU_HARD_RELOAD_ITEM:
-      GetWidget()->GetAccelerator(IDC_RELOAD_IGNORING_CACHE, accelerator);
+      GetWidget()->GetAccelerator(IDC_RELOAD_BYPASSING_CACHE, accelerator);
       return true;
   }
   return GetWidget()->GetAccelerator(command_id, accelerator);
 }
 
 void ReloadButton::ExecuteCommand(int command_id, int event_flags) {
   int browser_command = 0;
   switch (command_id) {
     case IDS_RELOAD_MENU_NORMAL_RELOAD_ITEM:
       browser_command = IDC_RELOAD;
       break;
     case IDS_RELOAD_MENU_HARD_RELOAD_ITEM:
-      browser_command = IDC_RELOAD_IGNORING_CACHE;
+      browser_command = IDC_RELOAD_BYPASSING_CACHE;
       break;
     case IDS_RELOAD_MENU_EMPTY_AND_HARD_RELOAD_ITEM:
       browser_command = IDC_RELOAD_CLEARING_CACHE;
       break;
     default:
       NOTREACHED();
   }
   ExecuteBrowserCommand(browser_command, event_flags);
 }
 
@@ skipping 46 matching lines @@
 
 void ReloadButton::OnDoubleClickTimer() {
   if (!IsMenuShowing())
     ChangeMode(intended_mode_, false);
 }
 
 void ReloadButton::OnStopToReloadTimer() {
   DCHECK(!IsMenuShowing());
   ChangeMode(intended_mode_, true);
 }