summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authoravayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-20 04:38:50 +0000
committeravayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-20 04:38:50 +0000
commit0c13b4a1a56078265821f10b5bb77a4ac2f891ce (patch)
tree7e0446e605bf67dbe9d9e83de96bbcaead1a68d4 /chrome/browser/views
parentbfcd1688e9a59ffd52c5073b9e4bb528bd53df74 (diff)
downloadchromium_src-0c13b4a1a56078265821f10b5bb77a4ac2f891ce.zip
chromium_src-0c13b4a1a56078265821f10b5bb77a4ac2f891ce.tar.gz
chromium_src-0c13b4a1a56078265821f10b5bb77a4ac2f891ce.tar.bz2
Bound page reloading ignoring cache to the following user actions:
- pressing Ctrl+F5 or Shift+F5 or Ctrl+Shift+R - Shift- or Ctrl-clicking the Reload button. Should work on Windows and Chrome OS (including compact navigation mode). BUG=36244 TEST=Verify that everything works as described above. Review URL: http://codereview.chromium.org/650048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/toolbar_view.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 2d18cad..b2125d4 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -233,6 +233,12 @@ void ToolbarView::ButtonPressed(
// ongoing user edits, since it doesn't realize this is a user-initiated
// action.
location_bar_->Revert();
+ // Shift-clicking or Ctrl-clicking the reload button means we should
+ // ignore any cached content.
+ // TODO(avayvod): eliminate duplication of this logic in
+ // CompactLocationBarView.
+ if (id == IDC_RELOAD && (event.IsShiftDown() || event.IsControlDown()))
+ id = IDC_RELOAD_IGNORING_CACHE;
break;
}
browser_->ExecuteCommandWithDisposition(