[Android] Fix refresh keyboard shortcut behavior.

chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

Index: chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
index c853efe7b85f49fa9ef6671d82348b84c7f20061..d2552e59beead8e0f066c35ef5d3eb56c19d26b1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
@@ -215,10 +215,26 @@ public class KeyboardShortcuts {
                     cvc = activity.getCurrentContentViewCore();
                     if (cvc != null) cvc.zoomReset();
                     return true;
+                case SHIFT | CTRL | KeyEvent.KEYCODE_R:
                 case CTRL | KeyEvent.KEYCODE_R:
+                case SHIFT | KeyEvent.KEYCODE_F5:
                 case KeyEvent.KEYCODE_F5:
                     Tab tab = activity.getActivityTab();
-                    if (tab != null) tab.reload();
+                    if (tab != null) {
+                        if ((keyCodeAndMeta & SHIFT) == SHIFT) {
+                            tab.reloadIgnoringCache();
+                        } else {
+                            tab.reload();
+                        }
+
+                        if (activity.getToolbarManager() != null
+                                && tab.getWebContents() != null
+                                && tab.getWebContents().focusLocationBarByDefault()) {
+                            activity.getToolbarManager().revertLocationBarChanges();
+                        } else {
+                            tab.requestFocus();
+                        }
+                    }
                     return true;
                 case ALT | KeyEvent.KEYCODE_DPAD_LEFT:
                     tab = activity.getActivityTab();