| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/panels/panel_view.h" | 5 #include "chrome/browser/ui/views/panels/panel_view.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 int modifiers; | 67 int modifiers; |
| 68 int command_id; | 68 int command_id; |
| 69 }; | 69 }; |
| 70 const AcceleratorMapping kPanelAcceleratorMap[] = { | 70 const AcceleratorMapping kPanelAcceleratorMap[] = { |
| 71 { ui::VKEY_W, ui::EF_CONTROL_DOWN, IDC_CLOSE_WINDOW }, | 71 { ui::VKEY_W, ui::EF_CONTROL_DOWN, IDC_CLOSE_WINDOW }, |
| 72 { ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_CLOSE_WINDOW }, | 72 { ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_CLOSE_WINDOW }, |
| 73 { ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW }, | 73 { ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW }, |
| 74 { ui::VKEY_R, ui::EF_CONTROL_DOWN, IDC_RELOAD }, | 74 { ui::VKEY_R, ui::EF_CONTROL_DOWN, IDC_RELOAD }, |
| 75 { ui::VKEY_F5, ui::EF_NONE, IDC_RELOAD }, | 75 { ui::VKEY_F5, ui::EF_NONE, IDC_RELOAD }, |
| 76 { ui::VKEY_R, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 76 { ui::VKEY_R, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 77 IDC_RELOAD_IGNORING_CACHE }, | 77 IDC_RELOAD_BYPASSING_CACHE }, |
| 78 { ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE }, | 78 { ui::VKEY_F5, ui::EF_CONTROL_DOWN, IDC_RELOAD_BYPASSING_CACHE }, |
| 79 { ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE }, | 79 { ui::VKEY_F5, ui::EF_SHIFT_DOWN, IDC_RELOAD_BYPASSING_CACHE }, |
| 80 { ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP }, | 80 { ui::VKEY_ESCAPE, ui::EF_NONE, IDC_STOP }, |
| 81 { ui::VKEY_OEM_MINUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS }, | 81 { ui::VKEY_OEM_MINUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS }, |
| 82 { ui::VKEY_SUBTRACT, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS }, | 82 { ui::VKEY_SUBTRACT, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS }, |
| 83 { ui::VKEY_0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL }, | 83 { ui::VKEY_0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL }, |
| 84 { ui::VKEY_NUMPAD0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL }, | 84 { ui::VKEY_NUMPAD0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL }, |
| 85 { ui::VKEY_OEM_PLUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, | 85 { ui::VKEY_OEM_PLUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, |
| 86 { ui::VKEY_ADD, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, | 86 { ui::VKEY_ADD, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS }, |
| 87 { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_DEV_TOOLS }, | 87 { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_DEV_TOOLS }, |
| 88 { ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 88 { ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 89 IDC_DEV_TOOLS_CONSOLE }, | 89 IDC_DEV_TOOLS_CONSOLE }, |
| (...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1144 // SWP_FRAMECHANGED flag must be called in order for the cached window data | 1144 // SWP_FRAMECHANGED flag must be called in order for the cached window data |
| 1145 // to be updated properly. | 1145 // to be updated properly. |
| 1146 // http://msdn.microsoft.com/en-us/library/windows/desktop/ms633591(v=vs.85).a
spx | 1146 // http://msdn.microsoft.com/en-us/library/windows/desktop/ms633591(v=vs.85).a
spx |
| 1147 if (update_frame) { | 1147 if (update_frame) { |
| 1148 ::SetWindowPos(native_window, NULL, 0, 0, 0, 0, | 1148 ::SetWindowPos(native_window, NULL, 0, 0, 0, 0, |
| 1149 SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | | 1149 SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | |
| 1150 SWP_NOZORDER | SWP_NOACTIVATE); | 1150 SWP_NOZORDER | SWP_NOACTIVATE); |
| 1151 } | 1151 } |
| 1152 } | 1152 } |
| 1153 #endif | 1153 #endif |
| OLD | NEW |