| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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/gtk/standard_menus.h" | 5 #include "chrome/browser/gtk/standard_menus.h" |
| 6 | 6 |
| 7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
| 8 #include <gdk/gdkkeysyms.h> | 8 #include <gdk/gdkkeysyms.h> |
| 9 | 9 |
| 10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 struct MenuCreateMaterial standard_app_menu_materials[] = { | 80 struct MenuCreateMaterial standard_app_menu_materials[] = { |
| 81 { MENU_NORMAL, IDC_NEW_TAB, IDS_NEW_TAB, 0, NULL, | 81 { MENU_NORMAL, IDC_NEW_TAB, IDS_NEW_TAB, 0, NULL, |
| 82 GDK_t, GDK_CONTROL_MASK }, | 82 GDK_t, GDK_CONTROL_MASK }, |
| 83 { MENU_NORMAL, IDC_NEW_WINDOW, IDS_NEW_WINDOW, 0, NULL, | 83 { MENU_NORMAL, IDC_NEW_WINDOW, IDS_NEW_WINDOW, 0, NULL, |
| 84 GDK_n, GDK_CONTROL_MASK }, | 84 GDK_n, GDK_CONTROL_MASK }, |
| 85 { MENU_NORMAL, IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW, 0, NULL, | 85 { MENU_NORMAL, IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW, 0, NULL, |
| 86 GDK_n, GDK_CONTROL_MASK | GDK_SHIFT_MASK}, | 86 GDK_n, GDK_CONTROL_MASK | GDK_SHIFT_MASK}, |
| 87 { MENU_SEPARATOR }, | 87 { MENU_SEPARATOR }, |
| 88 { MENU_CHECKBOX, IDC_SHOW_BOOKMARK_BAR, IDS_SHOW_BOOKMARK_BAR, 0, NULL, | 88 { MENU_CHECKBOX, IDC_SHOW_BOOKMARK_BAR, IDS_SHOW_BOOKMARK_BAR, 0, NULL, |
| 89 GDK_b, GDK_CONTROL_MASK }, | 89 GDK_b, GDK_CONTROL_MASK }, |
| 90 { MENU_NORMAL, IDC_FULLSCREEN, IDS_FULLSCREEN, 0, NULL, GDK_F11 }, |
| 90 { MENU_SEPARATOR }, | 91 { MENU_SEPARATOR }, |
| 91 { MENU_NORMAL, IDC_SHOW_HISTORY, IDS_SHOW_HISTORY, 0, NULL, | 92 { MENU_NORMAL, IDC_SHOW_HISTORY, IDS_SHOW_HISTORY, 0, NULL, |
| 92 GDK_h, GDK_CONTROL_MASK }, | 93 GDK_h, GDK_CONTROL_MASK }, |
| 93 { MENU_NORMAL, IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER, 0, NULL, | 94 { MENU_NORMAL, IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER, 0, NULL, |
| 94 GDK_b, GDK_CONTROL_MASK | GDK_SHIFT_MASK }, | 95 GDK_b, GDK_CONTROL_MASK | GDK_SHIFT_MASK }, |
| 95 { MENU_NORMAL, IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS, 0, NULL, | 96 { MENU_NORMAL, IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS, 0, NULL, |
| 96 GDK_j, GDK_CONTROL_MASK }, | 97 GDK_j, GDK_CONTROL_MASK }, |
| 97 { MENU_NORMAL, IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS }, | 98 { MENU_NORMAL, IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS }, |
| 98 { MENU_SEPARATOR }, | 99 { MENU_SEPARATOR }, |
| 99 { MENU_NORMAL, IDC_SYNC_BOOKMARKS, IDS_SYNC_MY_BOOKMARKS_LABEL}, | 100 { MENU_NORMAL, IDC_SYNC_BOOKMARKS, IDS_SYNC_MY_BOOKMARKS_LABEL}, |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 developer_menu_materials : developer_menu_materials_no_inspector; | 147 developer_menu_materials : developer_menu_materials_no_inspector; |
| 147 } | 148 } |
| 148 } | 149 } |
| 149 | 150 |
| 150 return standard_page_menu_materials; | 151 return standard_page_menu_materials; |
| 151 } | 152 } |
| 152 | 153 |
| 153 const MenuCreateMaterial* GetStandardAppMenu() { | 154 const MenuCreateMaterial* GetStandardAppMenu() { |
| 154 return standard_app_menu_materials; | 155 return standard_app_menu_materials; |
| 155 } | 156 } |
| OLD | NEW |