| Index: chrome/browser/ui/views/accelerator_table.cc
|
| diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc
|
| index 21f858d5b5fc401e3b8db3202809c094e0cbb164..402c225da4f522fdd151c9a398c54bbafbfe61ac 100644
|
| --- a/chrome/browser/ui/views/accelerator_table.cc
|
| +++ b/chrome/browser/ui/views/accelerator_table.cc
|
| @@ -66,7 +66,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
|
| #endif // ENABLE_BASIC_PRINTING
|
| { ui::VKEY_R, ui::EF_CONTROL_DOWN, IDC_RELOAD },
|
| { ui::VKEY_R, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
|
| - IDC_RELOAD_IGNORING_CACHE },
|
| + IDC_RELOAD_BYPASSING_CACHE },
|
| { ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME },
|
| { ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE },
|
| { ui::VKEY_9, kPlatformModifier, IDC_SELECT_LAST_TAB },
|
| @@ -140,8 +140,8 @@ const AcceleratorMapping kAcceleratorMap[] = {
|
| { ui::VKEY_F4, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB },
|
| { ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW },
|
| { ui::VKEY_F5, ui::EF_NONE, IDC_RELOAD },
|
| - { ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE },
|
| - { ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE },
|
| + { ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_BYPASSING_CACHE },
|
| + { ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_BYPASSING_CACHE },
|
| { ui::VKEY_F6, ui::EF_NONE, IDC_FOCUS_NEXT_PANE },
|
| { ui::VKEY_F6, ui::EF_SHIFT_DOWN, IDC_FOCUS_PREVIOUS_PANE },
|
| { ui::VKEY_F10, ui::EF_NONE, IDC_FOCUS_MENU_BAR },
|
| @@ -153,8 +153,8 @@ const AcceleratorMapping kAcceleratorMap[] = {
|
| { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD },
|
| { ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME },
|
| { ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD },
|
| - { ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE },
|
| - { ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE },
|
| + { ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_BYPASSING_CACHE },
|
| + { ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_BYPASSING_CACHE },
|
| #endif // defined(OS_LINUX)
|
|
|
| #if defined(OS_CHROMEOS)
|
|
|