OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #ifndef CHROME_BROWSER_GTK_MENU_GTK_H_ | 5 #ifndef CHROME_BROWSER_GTK_MENU_GTK_H_ |
6 #define CHROME_BROWSER_GTK_MENU_GTK_H_ | 6 #define CHROME_BROWSER_GTK_MENU_GTK_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <gtk/gtk.h> | 9 #include <gtk/gtk.h> |
10 | 10 |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 | 56 |
57 // These methods are used to build the menu dynamically. The return value | 57 // These methods are used to build the menu dynamically. The return value |
58 // is the new menu item. | 58 // is the new menu item. |
59 GtkWidget* AppendMenuItemWithLabel(int command_id, const std::string& label); | 59 GtkWidget* AppendMenuItemWithLabel(int command_id, const std::string& label); |
60 GtkWidget* AppendMenuItemWithIcon(int command_id, const std::string& label, | 60 GtkWidget* AppendMenuItemWithIcon(int command_id, const std::string& label, |
61 const SkBitmap& icon); | 61 const SkBitmap& icon); |
62 GtkWidget* AppendCheckMenuItemWithLabel(int command_id, | 62 GtkWidget* AppendCheckMenuItemWithLabel(int command_id, |
63 const std::string& label); | 63 const std::string& label); |
64 GtkWidget* AppendSeparator(); | 64 GtkWidget* AppendSeparator(); |
65 GtkWidget* AppendMenuItem(int command_id, GtkWidget* menu_item); | 65 GtkWidget* AppendMenuItem(int command_id, GtkWidget* menu_item); |
66 GtkWidget* AppendMenuItemToMenu(int command_id, | 66 GtkWidget* AppendMenuItemToMenu(int index, |
| 67 menus::MenuModel* model, |
67 GtkWidget* menu_item, | 68 GtkWidget* menu_item, |
68 GtkWidget* menu, | 69 GtkWidget* menu, |
69 bool connect_to_activate); | 70 bool connect_to_activate); |
70 | 71 |
71 // Displays the menu. |timestamp| is the time of activation. The popup is | 72 // Displays the menu. |timestamp| is the time of activation. The popup is |
72 // statically positioned at |widget|. | 73 // statically positioned at |widget|. |
73 void Popup(GtkWidget* widget, gint button_type, guint32 timestamp); | 74 void Popup(GtkWidget* widget, gint button_type, guint32 timestamp); |
74 | 75 |
75 // Displays the menu using the button type and timestamp of |event|. The popup | 76 // Displays the menu using the button type and timestamp of |event|. The popup |
76 // is statically positioned at |widget|. | 77 // is statically positioned at |widget|. |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 // menu. | 171 // menu. |
171 static bool block_activation_; | 172 static bool block_activation_; |
172 | 173 |
173 // We must free these at shutdown. | 174 // We must free these at shutdown. |
174 std::vector<MenuGtk*> submenus_we_own_; | 175 std::vector<MenuGtk*> submenus_we_own_; |
175 | 176 |
176 ScopedRunnableMethodFactory<MenuGtk> factory_; | 177 ScopedRunnableMethodFactory<MenuGtk> factory_; |
177 }; | 178 }; |
178 | 179 |
179 #endif // CHROME_BROWSER_GTK_MENU_GTK_H_ | 180 #endif // CHROME_BROWSER_GTK_MENU_GTK_H_ |
OLD | NEW |