| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/browser_titlebar.h" | 5 #include "chrome/browser/gtk/browser_titlebar.h" |
| 6 | 6 |
| 7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 } | 123 } |
| 124 | 124 |
| 125 MenuCreateMaterial g_favicon_menu[] = { | 125 MenuCreateMaterial g_favicon_menu[] = { |
| 126 { MENU_NORMAL, IDC_BACK, IDS_CONTENT_CONTEXT_BACK, 0, NULL, | 126 { MENU_NORMAL, IDC_BACK, IDS_CONTENT_CONTEXT_BACK, 0, NULL, |
| 127 GDK_Left, GDK_MOD1_MASK, true }, | 127 GDK_Left, GDK_MOD1_MASK, true }, |
| 128 { MENU_NORMAL, IDC_FORWARD, IDS_CONTENT_CONTEXT_FORWARD, 0, NULL, | 128 { MENU_NORMAL, IDC_FORWARD, IDS_CONTENT_CONTEXT_FORWARD, 0, NULL, |
| 129 GDK_Right, GDK_MOD1_MASK, true }, | 129 GDK_Right, GDK_MOD1_MASK, true }, |
| 130 { MENU_NORMAL, IDC_RELOAD, IDS_APP_MENU_RELOAD, 0, NULL, | 130 { MENU_NORMAL, IDC_RELOAD, IDS_APP_MENU_RELOAD, 0, NULL, |
| 131 GDK_R, GDK_CONTROL_MASK, true }, | 131 GDK_R, GDK_CONTROL_MASK, true }, |
| 132 { MENU_SEPARATOR }, | 132 { MENU_SEPARATOR }, |
| 133 { MENU_NORMAL, IDC_RESTORE_TAB, IDS_APP_MENU_RELOAD, 0, NULL, | 133 { MENU_NORMAL, IDC_RESTORE_TAB, IDS_RESTORE_TAB, 0, NULL, |
| 134 GDK_T, GDK_CONTROL_MASK | GDK_SHIFT_MASK, true }, | 134 GDK_T, GDK_CONTROL_MASK | GDK_SHIFT_MASK, true }, |
| 135 { MENU_NORMAL, IDC_DUPLICATE_TAB, IDS_APP_MENU_DUPLICATE_APP_WINDOW }, | 135 { MENU_NORMAL, IDC_DUPLICATE_TAB, IDS_APP_MENU_DUPLICATE_APP_WINDOW }, |
| 136 { MENU_NORMAL, IDC_COPY_URL, IDS_APP_MENU_COPY_URL }, | 136 { MENU_NORMAL, IDC_COPY_URL, IDS_APP_MENU_COPY_URL }, |
| 137 { MENU_NORMAL, IDC_SHOW_AS_TAB, IDS_SHOW_AS_TAB }, | 137 { MENU_NORMAL, IDC_SHOW_AS_TAB, IDS_SHOW_AS_TAB }, |
| 138 { MENU_NORMAL, IDC_NEW_TAB, IDS_APP_MENU_NEW_WEB_PAGE, 0, NULL, | 138 { MENU_NORMAL, IDC_NEW_TAB, IDS_APP_MENU_NEW_WEB_PAGE, 0, NULL, |
| 139 GDK_T, GDK_CONTROL_MASK }, | 139 GDK_T, GDK_CONTROL_MASK }, |
| 140 }; | 140 }; |
| 141 | 141 |
| 142 const MenuCreateMaterial* GetFaviconMenu(Profile* profile, | 142 const MenuCreateMaterial* GetFaviconMenu(Profile* profile, |
| 143 MenuGtk::Delegate* delegate) { | 143 MenuGtk::Delegate* delegate) { |
| (...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 696 if (g_throbber_frames) | 696 if (g_throbber_frames) |
| 697 return; | 697 return; |
| 698 | 698 |
| 699 // We load the light version of the throbber since it'll be in the titlebar. | 699 // We load the light version of the throbber since it'll be in the titlebar. |
| 700 g_throbber_frames = new std::vector<GdkPixbuf*>; | 700 g_throbber_frames = new std::vector<GdkPixbuf*>; |
| 701 MakeThrobberFrames(IDR_THROBBER_LIGHT, g_throbber_frames); | 701 MakeThrobberFrames(IDR_THROBBER_LIGHT, g_throbber_frames); |
| 702 | 702 |
| 703 g_throbber_waiting_frames = new std::vector<GdkPixbuf*>; | 703 g_throbber_waiting_frames = new std::vector<GdkPixbuf*>; |
| 704 MakeThrobberFrames(IDR_THROBBER_WAITING_LIGHT, g_throbber_waiting_frames); | 704 MakeThrobberFrames(IDR_THROBBER_WAITING_LIGHT, g_throbber_waiting_frames); |
| 705 } | 705 } |
| OLD | NEW |