Linux: Ignore certain menu accelerators.

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

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

1 files changed, 30 insertions, 32 deletions

diff --git a/chrome/browser/gtk/standard_menus.cc b/chrome/browser/gtk/standard_menus.cc
index 335e275..1ca6ddc 100644
--- a/chrome/browser/gtk/standard_menus.cc
+++ b/chrome/browser/gtk/standard_menus.cc
@@ -30,13 +30,12 @@ struct MenuCreateMaterial zoom_menu_materials[] = {
     GDK_minus, GDK_CONTROL_MASK },
   { MENU_NORMAL, IDC_ZOOM_MINUS, IDS_ZOOM_MINUS, 0, NULL,
     GDK_KP_Subtract, GDK_CONTROL_MASK },
-  { MENU_END, 0, 0, 0, NULL }
+  { MENU_END }
 };
 
 struct MenuCreateMaterial encoding_menu_materials[] = {
-  { MENU_CHECKBOX, IDC_ENCODING_AUTO_DETECT, IDS_ENCODING_AUTO_DETECT, 0,
-    NULL },
-  { MENU_END, 0, 0, 0, NULL }
+  { MENU_CHECKBOX, IDC_ENCODING_AUTO_DETECT, IDS_ENCODING_AUTO_DETECT },
+  { MENU_END }
 };
 
 struct MenuCreateMaterial developer_menu_materials[] = {
@@ -48,30 +47,30 @@ struct MenuCreateMaterial developer_menu_materials[] = {
     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 }
+  { MENU_END }
 };
 
 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, 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 },
+  { MENU_NORMAL, IDC_CREATE_SHORTCUTS, IDS_CREATE_SHORTCUTS },
+  { MENU_SEPARATOR },
+  { MENU_NORMAL, IDC_CUT, IDS_CUT, 0, NULL, GDK_x, GDK_CONTROL_MASK, true },
+  { MENU_NORMAL, IDC_COPY, IDS_COPY, 0, NULL, GDK_c, GDK_CONTROL_MASK, true },
+  { MENU_NORMAL, IDC_PASTE, IDS_PASTE, 0, NULL, GDK_v, GDK_CONTROL_MASK, true },
+  { MENU_SEPARATOR },
   { 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 },
-  { MENU_NORMAL, IDC_ZOOM_MENU, IDS_ZOOM_MENU, 0, zoom_menu_materials, 0, 0 },
+  { MENU_SEPARATOR },
+  { MENU_NORMAL, IDC_ZOOM_MENU, IDS_ZOOM_MENU, 0, zoom_menu_materials },
   { MENU_NORMAL, IDC_ENCODING_MENU, IDS_ENCODING_MENU, 0,
-    encoding_menu_materials, 0, 0 },
-  { MENU_SEPARATOR, 0, 0, 0, NULL },
+    encoding_menu_materials },
+  { MENU_SEPARATOR },
   { MENU_NORMAL, IDC_DEVELOPER_MENU, IDS_DEVELOPER_MENU, 0,
-    developer_menu_materials, 0, 0 },
-  { MENU_SEPARATOR, 0, 0, 0, NULL },
-  { MENU_NORMAL, IDC_REPORT_BUG, IDS_REPORT_BUG, 0, NULL },
-  { MENU_END, 0, 0, 0, NULL }
+    developer_menu_materials },
+  { MENU_SEPARATOR },
+  { MENU_NORMAL, IDC_REPORT_BUG, IDS_REPORT_BUG },
+  { MENU_END }
 };
 
 // -----------------------------------------------------------------------
@@ -83,28 +82,27 @@ struct MenuCreateMaterial standard_app_menu_materials[] = {
     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 },
+  { MENU_SEPARATOR },
   { MENU_NORMAL, IDC_SHOW_BOOKMARK_BAR, IDS_SHOW_BOOKMARK_BAR, 0, NULL,
     GDK_b, GDK_CONTROL_MASK },
-  { MENU_SEPARATOR, 0, 0, NULL },
+  { MENU_SEPARATOR },
   { 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 },
+  { MENU_SEPARATOR },
   // 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,
-    GDK_F1, 0 },
-  { MENU_SEPARATOR, 0, 0, 0, NULL },
-  { MENU_NORMAL, IDC_EXIT, IDS_EXIT, 0, NULL },
-  { MENU_END, 0, 0, 0, NULL }
+  { MENU_NORMAL, IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA },
+  { MENU_NORMAL, IDC_IMPORT_SETTINGS, IDS_IMPORT_SETTINGS },
+  { MENU_SEPARATOR },
+  { MENU_NORMAL, IDC_OPTIONS, IDS_OPTIONS, IDS_PRODUCT_NAME },
+  { MENU_NORMAL, IDC_ABOUT, IDS_ABOUT, IDS_PRODUCT_NAME },
+  { MENU_NORMAL, IDC_HELP_PAGE, IDS_HELP_PAGE, 0, NULL, GDK_F1 },
+  { MENU_SEPARATOR },
+  { MENU_NORMAL, IDC_EXIT, IDS_EXIT },
+  { MENU_END }
 };
 }  // namespace