Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/accelerator_table_gtk.cc

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/accelerator_table_gtk.h ('k') | chrome/browser/ui/views/accessible_pane_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/accelerator_table_gtk.cc
===================================================================
--- chrome/browser/ui/views/accelerator_table_gtk.cc (revision 71220)
+++ chrome/browser/ui/views/accelerator_table_gtk.cc (working copy)
@@ -4,9 +4,9 @@
#include "chrome/browser/ui/views/accelerator_table_gtk.h"
-#include "app/keyboard_codes.h"
#include "base/basictypes.h"
#include "chrome/app/chrome_command_ids.h"
+#include "ui/base/keycodes/keyboard_codes.h"
namespace browser {
@@ -14,144 +14,144 @@
// the Windows accelerators in ../../app/chrome_dll.rc.
const AcceleratorMapping kAcceleratorMap[] = {
// Keycode Shift Ctrl Alt Command ID
- { app::VKEY_A, true, true, false, IDC_AUTOFILL_DEFAULT },
- { app::VKEY_LEFT, false, false, true, IDC_BACK },
- { app::VKEY_BACK, false, false, false, IDC_BACK },
+ { ui::VKEY_A, true, true, false, IDC_AUTOFILL_DEFAULT },
+ { ui::VKEY_LEFT, false, false, true, IDC_BACK },
+ { ui::VKEY_BACK, false, false, false, IDC_BACK },
#if defined(OS_CHROMEOS)
- { app::VKEY_F1, false, false, false, IDC_BACK },
+ { ui::VKEY_F1, false, false, false, IDC_BACK },
// TODO(mazda): Change VKEY_1 to VKEY_OME_2 once the new version of the
// keyboard overlay is ready.
- { app::VKEY_1, false, true, true, IDC_SHOW_KEYBOARD_OVERLAY },
+ { ui::VKEY_1, false, true, true, IDC_SHOW_KEYBOARD_OVERLAY },
#endif
- { app::VKEY_D, false, true, false, IDC_BOOKMARK_PAGE },
- { app::VKEY_D, true, true, false, IDC_BOOKMARK_ALL_TABS },
- { app::VKEY_DELETE, true, true, false, IDC_CLEAR_BROWSING_DATA },
+ { ui::VKEY_D, false, true, false, IDC_BOOKMARK_PAGE },
+ { ui::VKEY_D, true, true, false, IDC_BOOKMARK_ALL_TABS },
+ { ui::VKEY_DELETE, true, true, false, IDC_CLEAR_BROWSING_DATA },
#if !defined(OS_CHROMEOS)
- { app::VKEY_F4, false, true, false, IDC_CLOSE_TAB },
+ { ui::VKEY_F4, false, true, false, IDC_CLOSE_TAB },
#endif
- { app::VKEY_W, false, true, false, IDC_CLOSE_TAB },
- { app::VKEY_W, true, true, false, IDC_CLOSE_WINDOW },
+ { ui::VKEY_W, false, true, false, IDC_CLOSE_TAB },
+ { ui::VKEY_W, true, true, false, IDC_CLOSE_WINDOW },
#if !defined(OS_CHROMEOS)
- { app::VKEY_F4, false, false, true, IDC_CLOSE_WINDOW },
+ { ui::VKEY_F4, false, false, true, IDC_CLOSE_WINDOW },
#endif
- { app::VKEY_Q, true, true, false, IDC_EXIT },
- { app::VKEY_F, false, true, false, IDC_FIND },
- { app::VKEY_G, false, true, false, IDC_FIND_NEXT },
+ { ui::VKEY_Q, true, true, false, IDC_EXIT },
+ { ui::VKEY_F, false, true, false, IDC_FIND },
+ { ui::VKEY_G, false, true, false, IDC_FIND_NEXT },
#if !defined(OS_CHROMEOS)
- { app::VKEY_F3, false, false, false, IDC_FIND_NEXT },
+ { ui::VKEY_F3, false, false, false, IDC_FIND_NEXT },
#endif
- { app::VKEY_G, true, true, false, IDC_FIND_PREVIOUS },
+ { ui::VKEY_G, true, true, false, IDC_FIND_PREVIOUS },
#if !defined(OS_CHROMEOS)
- { app::VKEY_F3, true, false, false, IDC_FIND_PREVIOUS },
+ { ui::VKEY_F3, true, false, false, IDC_FIND_PREVIOUS },
#endif
#if defined(OS_CHROMEOS)
- { app::VKEY_S, true, false, true, IDC_FOCUS_CHROMEOS_STATUS },
+ { ui::VKEY_S, true, false, true, IDC_FOCUS_CHROMEOS_STATUS },
#endif
- { app::VKEY_D, false, false, true, IDC_FOCUS_LOCATION },
- { app::VKEY_L, false, true, false, IDC_FOCUS_LOCATION },
+ { ui::VKEY_D, false, false, true, IDC_FOCUS_LOCATION },
+ { ui::VKEY_L, false, true, false, IDC_FOCUS_LOCATION },
#if !defined(OS_CHROMEOS)
- { app::VKEY_F10, false, false, false, IDC_FOCUS_MENU_BAR },
+ { ui::VKEY_F10, false, false, false, IDC_FOCUS_MENU_BAR },
#endif
- { app::VKEY_MENU, false, false, false, IDC_FOCUS_MENU_BAR },
+ { ui::VKEY_MENU, false, false, false, IDC_FOCUS_MENU_BAR },
#if !defined(OS_CHROMEOS)
- { app::VKEY_F6, false, false, false, IDC_FOCUS_NEXT_PANE },
+ { ui::VKEY_F6, false, false, false, IDC_FOCUS_NEXT_PANE },
#endif
#if defined(OS_CHROMEOS)
- { app::VKEY_F2, false, true, false, IDC_FOCUS_NEXT_PANE },
+ { ui::VKEY_F2, false, true, false, IDC_FOCUS_NEXT_PANE },
#endif
#if !defined(OS_CHROMEOS)
- { app::VKEY_F6, true, false, false, IDC_FOCUS_PREVIOUS_PANE },
+ { ui::VKEY_F6, true, false, false, IDC_FOCUS_PREVIOUS_PANE },
#endif
#if defined(OS_CHROMEOS)
- { app::VKEY_F1, false, true, false, IDC_FOCUS_PREVIOUS_PANE },
+ { ui::VKEY_F1, false, true, false, IDC_FOCUS_PREVIOUS_PANE },
#endif
- { app::VKEY_K, false, true, false, IDC_FOCUS_SEARCH },
- { app::VKEY_E, false, true, false, IDC_FOCUS_SEARCH },
- { app::VKEY_BROWSER_SEARCH, false, false, false, IDC_FOCUS_SEARCH },
- { app::VKEY_T, true, false, true, IDC_FOCUS_TOOLBAR },
- { app::VKEY_B, true, false, true, IDC_FOCUS_BOOKMARKS },
- { app::VKEY_RIGHT, false, false, true, IDC_FORWARD },
- { app::VKEY_BACK, true, false, false, IDC_FORWARD },
+ { ui::VKEY_K, false, true, false, IDC_FOCUS_SEARCH },
+ { ui::VKEY_E, false, true, false, IDC_FOCUS_SEARCH },
+ { ui::VKEY_BROWSER_SEARCH, false, false, false, IDC_FOCUS_SEARCH },
+ { ui::VKEY_T, true, false, true, IDC_FOCUS_TOOLBAR },
+ { ui::VKEY_B, true, false, true, IDC_FOCUS_BOOKMARKS },
+ { ui::VKEY_RIGHT, false, false, true, IDC_FORWARD },
+ { ui::VKEY_BACK, true, false, false, IDC_FORWARD },
#if defined(OS_CHROMEOS)
- { app::VKEY_F2, false, false, false, IDC_FORWARD },
+ { ui::VKEY_F2, false, false, false, IDC_FORWARD },
#endif
#if !defined(OS_CHROMEOS)
- { app::VKEY_F11, false, false, false, IDC_FULLSCREEN },
+ { ui::VKEY_F11, false, false, false, IDC_FULLSCREEN },
#endif
#if defined(OS_CHROMEOS)
- { app::VKEY_F4, false, false, false, IDC_FULLSCREEN },
+ { ui::VKEY_F4, false, false, false, IDC_FULLSCREEN },
#endif
#if !defined(OS_CHROMEOS)
- { app::VKEY_F1, false, false, false, IDC_HELP_PAGE },
+ { ui::VKEY_F1, false, false, false, IDC_HELP_PAGE },
#endif
#if defined(OS_CHROMEOS)
- { app::VKEY_OEM_2, false, true, false, IDC_HELP_PAGE },
- { app::VKEY_OEM_2, true, true, false, IDC_HELP_PAGE },
+ { ui::VKEY_OEM_2, false, true, false, IDC_HELP_PAGE },
+ { ui::VKEY_OEM_2, true, true, false, IDC_HELP_PAGE },
#endif
- { app::VKEY_I, true, true, false, IDC_DEV_TOOLS },
- { app::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE },
- { app::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT },
- { app::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW },
- { app::VKEY_T, false, true, false, IDC_NEW_TAB },
- { app::VKEY_N, false, true, false, IDC_NEW_WINDOW },
- { app::VKEY_O, false, true, false, IDC_OPEN_FILE },
- { app::VKEY_P, false, true, false, IDC_PRINT},
- { app::VKEY_R, false, true, false, IDC_RELOAD },
- { app::VKEY_R, true, true, false, IDC_RELOAD_IGNORING_CACHE },
+ { ui::VKEY_I, true, true, false, IDC_DEV_TOOLS },
+ { ui::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE },
+ { ui::VKEY_C, true, true, false, IDC_DEV_TOOLS_INSPECT },
+ { ui::VKEY_N, true, true, false, IDC_NEW_INCOGNITO_WINDOW },
+ { ui::VKEY_T, false, true, false, IDC_NEW_TAB },
+ { ui::VKEY_N, false, true, false, IDC_NEW_WINDOW },
+ { ui::VKEY_O, false, true, false, IDC_OPEN_FILE },
+ { ui::VKEY_P, false, true, false, IDC_PRINT},
+ { ui::VKEY_R, false, true, false, IDC_RELOAD },
+ { ui::VKEY_R, true, true, false, IDC_RELOAD_IGNORING_CACHE },
#if !defined(OS_CHROMEOS)
- { app::VKEY_F5, false, false, false, IDC_RELOAD },
- { app::VKEY_F5, false, true, false, IDC_RELOAD_IGNORING_CACHE },
- { app::VKEY_F5, true, false, false, IDC_RELOAD_IGNORING_CACHE },
+ { ui::VKEY_F5, false, false, false, IDC_RELOAD },
+ { ui::VKEY_F5, false, true, false, IDC_RELOAD_IGNORING_CACHE },
+ { ui::VKEY_F5, true, false, false, IDC_RELOAD_IGNORING_CACHE },
#endif
#if defined(OS_CHROMEOS)
- { app::VKEY_F3, false, false, false, IDC_RELOAD },
- { app::VKEY_F3, false, true, false, IDC_RELOAD_IGNORING_CACHE },
- { app::VKEY_F3, true, false, false, IDC_RELOAD_IGNORING_CACHE },
+ { ui::VKEY_F3, false, false, false, IDC_RELOAD },
+ { ui::VKEY_F3, false, true, false, IDC_RELOAD_IGNORING_CACHE },
+ { ui::VKEY_F3, true, false, false, IDC_RELOAD_IGNORING_CACHE },
#endif
- { app::VKEY_HOME, false, false, true, IDC_HOME },
- { app::VKEY_T, true, true, false, IDC_RESTORE_TAB },
- { app::VKEY_S, false, true, false, IDC_SAVE_PAGE },
+ { ui::VKEY_HOME, false, false, true, IDC_HOME },
+ { ui::VKEY_T, true, true, false, IDC_RESTORE_TAB },
+ { ui::VKEY_S, false, true, false, IDC_SAVE_PAGE },
#if defined(OS_CHROMEOS)
- { app::VKEY_LWIN, false, false, false, IDC_SEARCH },
+ { ui::VKEY_LWIN, false, false, false, IDC_SEARCH },
#endif
- { app::VKEY_9, false, true, false, IDC_SELECT_LAST_TAB },
- { app::VKEY_NUMPAD9, false, true, false, IDC_SELECT_LAST_TAB },
- { app::VKEY_TAB, false, true, false, IDC_SELECT_NEXT_TAB },
- { app::VKEY_NEXT, false, true, false, IDC_SELECT_NEXT_TAB },
- { app::VKEY_TAB, true, true, false, IDC_SELECT_PREVIOUS_TAB },
- { app::VKEY_PRIOR, false, true, false, IDC_SELECT_PREVIOUS_TAB },
- { app::VKEY_1, false, true, false, IDC_SELECT_TAB_0 },
- { app::VKEY_NUMPAD1, false, true, false, IDC_SELECT_TAB_0 },
- { app::VKEY_2, false, true, false, IDC_SELECT_TAB_1 },
- { app::VKEY_NUMPAD2, false, true, false, IDC_SELECT_TAB_1 },
- { app::VKEY_3, false, true, false, IDC_SELECT_TAB_2 },
- { app::VKEY_NUMPAD3, false, true, false, IDC_SELECT_TAB_2 },
- { app::VKEY_4, false, true, false, IDC_SELECT_TAB_3 },
- { app::VKEY_NUMPAD4, false, true, false, IDC_SELECT_TAB_3 },
- { app::VKEY_5, false, true, false, IDC_SELECT_TAB_4 },
- { app::VKEY_NUMPAD5, false, true, false, IDC_SELECT_TAB_4 },
- { app::VKEY_6, false, true, false, IDC_SELECT_TAB_5 },
- { app::VKEY_NUMPAD6, false, true, false, IDC_SELECT_TAB_5 },
- { app::VKEY_7, false, true, false, IDC_SELECT_TAB_6 },
- { app::VKEY_NUMPAD7, false, true, false, IDC_SELECT_TAB_6 },
- { app::VKEY_8, false, true, false, IDC_SELECT_TAB_7 },
- { app::VKEY_NUMPAD8, false, true, false, IDC_SELECT_TAB_7 },
- { app::VKEY_B, true, true, false, IDC_SHOW_BOOKMARK_BAR },
- { app::VKEY_J, false, true, false, IDC_SHOW_DOWNLOADS },
- { app::VKEY_H, false, true, false, IDC_SHOW_HISTORY },
- { app::VKEY_F, false, false, true, IDC_SHOW_APP_MENU},
- { app::VKEY_E, false, false, true, IDC_SHOW_APP_MENU},
- { app::VKEY_ESCAPE, false, false, false, IDC_STOP },
- { app::VKEY_ESCAPE, true, false, false, IDC_TASK_MANAGER },
- { app::VKEY_U, false, true, false, IDC_VIEW_SOURCE },
- { app::VKEY_OEM_MINUS, false, true, false, IDC_ZOOM_MINUS },
- { app::VKEY_OEM_MINUS, true, true, false, IDC_ZOOM_MINUS },
- { app::VKEY_SUBTRACT, false, true, false, IDC_ZOOM_MINUS },
- { app::VKEY_0, false, true, false, IDC_ZOOM_NORMAL },
- { app::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL },
- { app::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS },
- { app::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS },
- { app::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS },
+ { ui::VKEY_9, false, true, false, IDC_SELECT_LAST_TAB },
+ { ui::VKEY_NUMPAD9, false, true, false, IDC_SELECT_LAST_TAB },
+ { ui::VKEY_TAB, false, true, false, IDC_SELECT_NEXT_TAB },
+ { ui::VKEY_NEXT, false, true, false, IDC_SELECT_NEXT_TAB },
+ { ui::VKEY_TAB, true, true, false, IDC_SELECT_PREVIOUS_TAB },
+ { ui::VKEY_PRIOR, false, true, false, IDC_SELECT_PREVIOUS_TAB },
+ { ui::VKEY_1, false, true, false, IDC_SELECT_TAB_0 },
+ { ui::VKEY_NUMPAD1, false, true, false, IDC_SELECT_TAB_0 },
+ { ui::VKEY_2, false, true, false, IDC_SELECT_TAB_1 },
+ { ui::VKEY_NUMPAD2, false, true, false, IDC_SELECT_TAB_1 },
+ { ui::VKEY_3, false, true, false, IDC_SELECT_TAB_2 },
+ { ui::VKEY_NUMPAD3, false, true, false, IDC_SELECT_TAB_2 },
+ { ui::VKEY_4, false, true, false, IDC_SELECT_TAB_3 },
+ { ui::VKEY_NUMPAD4, false, true, false, IDC_SELECT_TAB_3 },
+ { ui::VKEY_5, false, true, false, IDC_SELECT_TAB_4 },
+ { ui::VKEY_NUMPAD5, false, true, false, IDC_SELECT_TAB_4 },
+ { ui::VKEY_6, false, true, false, IDC_SELECT_TAB_5 },
+ { ui::VKEY_NUMPAD6, false, true, false, IDC_SELECT_TAB_5 },
+ { ui::VKEY_7, false, true, false, IDC_SELECT_TAB_6 },
+ { ui::VKEY_NUMPAD7, false, true, false, IDC_SELECT_TAB_6 },
+ { ui::VKEY_8, false, true, false, IDC_SELECT_TAB_7 },
+ { ui::VKEY_NUMPAD8, false, true, false, IDC_SELECT_TAB_7 },
+ { ui::VKEY_B, true, true, false, IDC_SHOW_BOOKMARK_BAR },
+ { ui::VKEY_J, false, true, false, IDC_SHOW_DOWNLOADS },
+ { ui::VKEY_H, false, true, false, IDC_SHOW_HISTORY },
+ { ui::VKEY_F, false, false, true, IDC_SHOW_APP_MENU},
+ { ui::VKEY_E, false, false, true, IDC_SHOW_APP_MENU},
+ { ui::VKEY_ESCAPE, false, false, false, IDC_STOP },
+ { ui::VKEY_ESCAPE, true, false, false, IDC_TASK_MANAGER },
+ { ui::VKEY_U, false, true, false, IDC_VIEW_SOURCE },
+ { ui::VKEY_OEM_MINUS, false, true, false, IDC_ZOOM_MINUS },
+ { ui::VKEY_OEM_MINUS, true, true, false, IDC_ZOOM_MINUS },
+ { ui::VKEY_SUBTRACT, false, true, false, IDC_ZOOM_MINUS },
+ { ui::VKEY_0, false, true, false, IDC_ZOOM_NORMAL },
+ { ui::VKEY_NUMPAD0, false, true, false, IDC_ZOOM_NORMAL },
+ { ui::VKEY_OEM_PLUS, false, true, false, IDC_ZOOM_PLUS },
+ { ui::VKEY_OEM_PLUS, true, true, false, IDC_ZOOM_PLUS },
+ { ui::VKEY_ADD, false, true, false, IDC_ZOOM_PLUS },
};
const size_t kAcceleratorMapLength = arraysize(kAcceleratorMap);
« no previous file with comments | « chrome/browser/ui/views/accelerator_table_gtk.h ('k') | chrome/browser/ui/views/accessible_pane_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698