Implement accelerators in the gtk port.

- Adds accelerators to all the menu items that had them on windows.
- Adds accelerators to back (Alt+left), forward (Alt+right), reload
  (Ctr+R) and focus the URL box (Ctr+L).

Review URL: http://codereview.chromium.org/28105


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10387 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 67 insertions, 50 deletions

diff --git a/chrome/browser/gtk/standard_menus.cc b/chrome/browser/gtk/standard_menus.cc
index bb0b6f8..355dabe 100644
--- a/chrome/browser/gtk/standard_menus.cc
+++ b/chrome/browser/gtk/standard_menus.cc
@@ -10,78 +10,95 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
 namespace {
 
 struct MenuCreateMaterial zoom_menu_materials[] = {
-  { MENU_NORMAL, IDC_ZOOM_PLUS, IDS_ZOOM_MENU, 0, NULL },
-  { MENU_NORMAL, IDC_ZOOM_PLUS, IDS_ZOOM_PLUS, 0, NULL },
-  { MENU_NORMAL, IDC_ZOOM_NORMAL, IDS_ZOOM_NORMAL, 0, NULL },
-  { MENU_NORMAL, IDC_ZOOM_MINUS, IDS_ZOOM_MINUS, 0, NULL },
-  { MENU_END, 0, 0, NULL }
+  { MENU_NORMAL, IDC_ZOOM_PLUS, IDS_ZOOM_PLUS, 0, NULL,
+    GDK_plus, GDK_CONTROL_MASK },
+  { MENU_NORMAL, IDC_ZOOM_NORMAL, IDS_ZOOM_NORMAL, 0, NULL,
+    GDK_0, GDK_CONTROL_MASK },
+  { MENU_NORMAL, IDC_ZOOM_MINUS, IDS_ZOOM_MINUS, 0, NULL,
+    GDK_minus, GDK_CONTROL_MASK },
+  { MENU_END, 0, 0, 0, NULL, 0, 0 }
 };
 
 struct MenuCreateMaterial encoding_menu_materials[] = {
   { MENU_CHECKBOX, IDC_ENCODING_AUTO_DETECT, IDS_ENCODING_AUTO_DETECT, 0,
-    NULL },
-  { MENU_END, 0, 0, NULL }
+    NULL, 0, 0 },
+  { MENU_END, 0, 0, 0, NULL, 0, 0 }
 };
 
 struct MenuCreateMaterial developer_menu_materials[] = {
-  { MENU_NORMAL, IDC_VIEW_SOURCE, IDS_VIEW_SOURCE, 0, NULL },
-  { MENU_NORMAL, IDC_DEBUGGER, IDS_DEBUGGER, 0, NULL },
-  { MENU_NORMAL, IDC_JS_CONSOLE, IDS_JS_CONSOLE, 0, NULL },
-  { MENU_NORMAL, IDC_TASK_MANAGER, IDS_TASK_MANAGER, 0, NULL },
-  { MENU_END, 0, 0, NULL }
+  { MENU_NORMAL, IDC_VIEW_SOURCE, IDS_VIEW_SOURCE, 0, NULL,
+    GDK_u, GDK_CONTROL_MASK },
+  { MENU_NORMAL, IDC_DEBUGGER, IDS_DEBUGGER, 0, NULL,
+    GDK_l, GDK_CONTROL_MASK | GDK_SHIFT_MASK },
+  { MENU_NORMAL, IDC_JS_CONSOLE, IDS_JS_CONSOLE, 0, NULL,
+    GDK_j, GDK_CONTROL_MASK | GDK_SHIFT_MASK },
+  { MENU_NORMAL, IDC_TASK_MANAGER, IDS_TASK_MANAGER, 0, NULL,
+    GDK_Escape, GDK_SHIFT_MASK },
+  { MENU_END, 0, 0, 0, NULL, 0, 0 }
 };
 
 struct MenuCreateMaterial standard_page_menu_materials[] = {
-  { MENU_NORMAL, IDC_CREATE_SHORTCUTS, IDS_CREATE_SHORTCUTS, 0, NULL },
-  { MENU_SEPARATOR, 0, 0, 0, NULL },
-  { MENU_NORMAL, IDC_CUT, IDS_CUT, 0, NULL },
-  { MENU_NORMAL, IDC_COPY, IDS_COPY, 0, NULL },
-  { MENU_NORMAL, IDC_PASTE, IDS_PASTE, 0, NULL },
-  { MENU_SEPARATOR, 0, 0, 0, NULL },
-  { MENU_NORMAL, IDC_FIND, IDS_FIND, 0, NULL },
-  { MENU_NORMAL, IDC_SAVE_PAGE, IDS_SAVE_PAGE, 0, NULL },
-  { MENU_NORMAL, IDC_PRINT, IDS_PRINT, 0, NULL },
-  { MENU_SEPARATOR, 0, 0, 0, NULL },
-  { MENU_NORMAL, IDC_ZOOM_MENU, IDS_ZOOM_MENU, 0, zoom_menu_materials },
+  { MENU_NORMAL, IDC_CREATE_SHORTCUTS, IDS_CREATE_SHORTCUTS, 0, NULL, 0, 0 },
+  { MENU_SEPARATOR, 0, 0, 0, NULL, 0, 0 },
+  { MENU_NORMAL, IDC_CUT, IDS_CUT, 0, NULL, GDK_x, GDK_CONTROL_MASK },
+  { MENU_NORMAL, IDC_COPY, IDS_COPY, 0, NULL, GDK_c, GDK_CONTROL_MASK },
+  { MENU_NORMAL, IDC_PASTE, IDS_PASTE, 0, NULL, GDK_v, GDK_CONTROL_MASK },
+  { MENU_SEPARATOR, 0, 0, 0, NULL, 0, 0 },
+  { MENU_NORMAL, IDC_FIND, IDS_FIND, 0, NULL, GDK_f, GDK_CONTROL_MASK },
+  { MENU_NORMAL, IDC_SAVE_PAGE, IDS_SAVE_PAGE, 0, NULL, GDK_s,
+    GDK_CONTROL_MASK },
+  { MENU_NORMAL, IDC_PRINT, IDS_PRINT, 0, NULL, GDK_p, GDK_CONTROL_MASK },
+  { MENU_SEPARATOR, 0, 0, 0, NULL, 0, 0 },
+  { MENU_NORMAL, IDC_ZOOM_MENU, IDS_ZOOM_MENU, 0, zoom_menu_materials, 0, 0 },
   { MENU_NORMAL, IDC_ENCODING_MENU, IDS_ENCODING_MENU, 0,
-    encoding_menu_materials },
-  { MENU_SEPARATOR, 0, 0, 0, NULL },
+    encoding_menu_materials, 0, 0 },
+  { MENU_SEPARATOR, 0, 0, 0, NULL, 0, 0 },
   { MENU_NORMAL, IDC_DEVELOPER_MENU, IDS_DEVELOPER_MENU, 0,
-    developer_menu_materials },
-  { MENU_SEPARATOR, 0, 0, 0, NULL },
-  { MENU_NORMAL, IDC_REPORT_BUG, IDS_REPORT_BUG, 0, NULL },
-  { MENU_END, 0, 0, NULL }
+    developer_menu_materials, 0, 0 },
+  { MENU_SEPARATOR, 0, 0, 0, NULL, 0, 0 },
+  { MENU_NORMAL, IDC_REPORT_BUG, IDS_REPORT_BUG, 0, NULL, 0, 0 },
+  { MENU_END, 0, 0, 0, NULL, 0, 0 }
 };
 
 // -----------------------------------------------------------------------
 
 struct MenuCreateMaterial standard_app_menu_materials[] = {
-  { MENU_NORMAL, IDC_NEW_TAB, IDS_NEW_TAB, 0, NULL },
-  { MENU_NORMAL, IDC_NEW_WINDOW, IDS_NEW_WINDOW, 0, NULL },
-  { MENU_NORMAL, IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW, 0, NULL },
-  { MENU_NORMAL, IDC_PROFILE_MENU, IDS_PROFILE_MENU, 0, NULL },
-  { MENU_SEPARATOR, 0, 0, NULL },
-  { MENU_NORMAL, IDC_SHOW_BOOKMARK_BAR, IDS_SHOW_BOOKMARK_BAR },
-  { MENU_SEPARATOR, 0, 0, NULL },
-  { MENU_NORMAL, IDC_SHOW_HISTORY, IDS_SHOW_HISTORY },
-  { MENU_NORMAL, IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER },
-  { MENU_NORMAL, IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS },
-  { MENU_SEPARATOR, 0, 0, NULL },
+  { MENU_NORMAL, IDC_NEW_TAB, IDS_NEW_TAB, 0, NULL,
+    GDK_t, GDK_CONTROL_MASK },
+  { MENU_NORMAL, IDC_NEW_WINDOW, IDS_NEW_WINDOW, 0, NULL,
+    GDK_n, GDK_CONTROL_MASK },
+  { MENU_NORMAL, IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW, 0, NULL,
+    GDK_n, GDK_CONTROL_MASK | GDK_SHIFT_MASK},
+  { MENU_SEPARATOR, 0, 0, NULL, 0, 0 },
+  { MENU_NORMAL, IDC_SHOW_BOOKMARK_BAR, IDS_SHOW_BOOKMARK_BAR, 0, NULL,
+    GDK_b, GDK_CONTROL_MASK },
+  { MENU_SEPARATOR, 0, 0, NULL, 0, 0 },
+  { MENU_NORMAL, IDC_SHOW_HISTORY, IDS_SHOW_HISTORY, 0, NULL,
+    GDK_h, GDK_CONTROL_MASK },
+  { MENU_NORMAL, IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER, 0, NULL,
+    GDK_b, GDK_CONTROL_MASK | GDK_SHIFT_MASK },
+  { MENU_NORMAL, IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS, 0, NULL,
+    GDK_j, GDK_CONTROL_MASK },
+  { MENU_SEPARATOR, 0, 0, NULL, 0, 0 },
   // TODO(erg): P13N stuff goes here as soon as they get IDS strings.
-  { MENU_NORMAL, IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA, 0, NULL },
-  { MENU_NORMAL, IDC_IMPORT_SETTINGS, IDS_IMPORT_SETTINGS, 0, NULL },
-  { MENU_SEPARATOR, 0, 0, 0, NULL },
-  { MENU_NORMAL, IDC_OPTIONS, IDS_OPTIONS, IDS_PRODUCT_NAME, NULL },
-  { MENU_NORMAL, IDC_ABOUT, IDS_ABOUT, IDS_PRODUCT_NAME, NULL },
-  { MENU_NORMAL, IDC_HELP_PAGE, IDS_HELP_PAGE, 0, NULL },
-  { MENU_SEPARATOR, 0, 0, 0, NULL },
-  { MENU_NORMAL, IDC_EXIT, IDS_EXIT, 0, NULL },
-  { MENU_END, 0, 0, NULL }
+  { MENU_NORMAL, IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA, 0, NULL,
+    0, 0 },
+  { MENU_NORMAL, IDC_IMPORT_SETTINGS, IDS_IMPORT_SETTINGS, 0, NULL, 0, 0 },
+  { MENU_SEPARATOR, 0, 0, 0, NULL, 0, 0 },
+  { MENU_NORMAL, IDC_OPTIONS, IDS_OPTIONS, IDS_PRODUCT_NAME, NULL, 0, 0 },
+  { MENU_NORMAL, IDC_ABOUT, IDS_ABOUT, IDS_PRODUCT_NAME, NULL, 0, 0 },
+  { MENU_NORMAL, IDC_HELP_PAGE, IDS_HELP_PAGE, 0, NULL,
+    GDK_F1, 0 },
+  { MENU_SEPARATOR, 0, 0, 0, NULL, 0, 0 },
+  { MENU_NORMAL, IDC_EXIT, IDS_EXIT, 0, NULL, 0, 0 },
+  { MENU_END, 0, 0, 0, NULL, 0, 0 }
 };
-
 }  // namespace
 
 const MenuCreateMaterial* GetStandardPageMenu() {