| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/gtk/menu_gtk.h" | 5 #include "chrome/browser/ui/gtk/menu_gtk.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
| (...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 510 g_signal_connect(submenu, "show", G_CALLBACK(OnSubMenuShowThunk), this); | 510 g_signal_connect(submenu, "show", G_CALLBACK(OnSubMenuShowThunk), this); |
| 511 g_signal_connect(submenu, "hide", G_CALLBACK(OnSubMenuHiddenThunk), this); | 511 g_signal_connect(submenu, "hide", G_CALLBACK(OnSubMenuHiddenThunk), this); |
| 512 } | 512 } |
| 513 | 513 |
| 514 ui::AcceleratorGtk accelerator; | 514 ui::AcceleratorGtk accelerator; |
| 515 if (model->GetAcceleratorAt(i, &accelerator)) { | 515 if (model->GetAcceleratorAt(i, &accelerator)) { |
| 516 gtk_widget_add_accelerator(menu_item, | 516 gtk_widget_add_accelerator(menu_item, |
| 517 "activate", | 517 "activate", |
| 518 dummy_accel_group_, | 518 dummy_accel_group_, |
| 519 accelerator.GetGdkKeyCode(), | 519 accelerator.GetGdkKeyCode(), |
| 520 accelerator.gdk_modifier_type(), | 520 accelerator.GetGdkModifierType(), |
| 521 GTK_ACCEL_VISIBLE); | 521 GTK_ACCEL_VISIBLE); |
| 522 } | 522 } |
| 523 | 523 |
| 524 g_object_set_data(G_OBJECT(menu_item), "model", model); | 524 g_object_set_data(G_OBJECT(menu_item), "model", model); |
| 525 AppendMenuItemToMenu(i, model, menu_item, menu, connect_to_activate); | 525 AppendMenuItemToMenu(i, model, menu_item, menu, connect_to_activate); |
| 526 | 526 |
| 527 menu_item = NULL; | 527 menu_item = NULL; |
| 528 } | 528 } |
| 529 } | 529 } |
| 530 | 530 |
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 895 gtk_widget_hide(widget); | 895 gtk_widget_hide(widget); |
| 896 } | 896 } |
| 897 | 897 |
| 898 GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget)); | 898 GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget)); |
| 899 if (submenu) { | 899 if (submenu) { |
| 900 gtk_container_foreach(GTK_CONTAINER(submenu), &SetMenuItemInfo, | 900 gtk_container_foreach(GTK_CONTAINER(submenu), &SetMenuItemInfo, |
| 901 userdata); | 901 userdata); |
| 902 } | 902 } |
| 903 } | 903 } |
| 904 } | 904 } |
| OLD | NEW |