diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 20:30:29 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 20:30:29 +0000 |
| commit | d6cfb363c38da49c18ae55d4c9d1513b6d829cea (patch) | |
| tree | fb74c8c385efd11266debf5a4f6033c773f7afd5 /views | |
| parent | 3fd1f9b3411bed659e99cab7b196b1ea3d2a3947 (diff) | |
| download | chromium_src-d6cfb363c38da49c18ae55d4c9d1513b6d829cea.zip chromium_src-d6cfb363c38da49c18ae55d4c9d1513b6d829cea.tar.gz chromium_src-d6cfb363c38da49c18ae55d4c9d1513b6d829cea.tar.bz2 | |
Fix number of arguments to gtk callback macro.
BUG=none
TEST=navigating menus using the keyboard no longer crashes.
Review URL: http://codereview.chromium.org/1549011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/menu/native_menu_gtk.cc | 8 | ||||
| -rw-r--r-- | views/controls/menu/native_menu_gtk.h | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc index 2654e8c..a10e130 100644 --- a/views/controls/menu/native_menu_gtk.cc +++ b/views/controls/menu/native_menu_gtk.cc @@ -218,10 +218,8 @@ void NativeMenuGtk::OnMenuHidden(GtkWidget* widget) { MessageLoop::current()->Quit(); } -// static void NativeMenuGtk::OnMenuMoveCurrent(GtkWidget* menu_widget, - GtkMenuDirectionType focus_direction, - NativeMenuGtk* menu) { + GtkMenuDirectionType focus_direction) { GtkWidget* parent = GTK_MENU_SHELL(menu_widget)->parent_menu_shell; GtkWidget* menu_item = GTK_MENU_SHELL(menu_widget)->active_menu_item; GtkWidget* submenu = NULL; @@ -230,10 +228,10 @@ void NativeMenuGtk::OnMenuMoveCurrent(GtkWidget* menu_widget, } if (focus_direction == GTK_MENU_DIR_CHILD && submenu == NULL) { - menu->GetAncestor()->menu_action_ = MENU_ACTION_NEXT; + GetAncestor()->menu_action_ = MENU_ACTION_NEXT; gtk_menu_popdown(GTK_MENU(menu_widget)); } else if (focus_direction == GTK_MENU_DIR_PARENT && parent == NULL) { - menu->GetAncestor()->menu_action_ = MENU_ACTION_PREVIOUS; + GetAncestor()->menu_action_ = MENU_ACTION_PREVIOUS; gtk_menu_popdown(GTK_MENU(menu_widget)); } } diff --git a/views/controls/menu/native_menu_gtk.h b/views/controls/menu/native_menu_gtk.h index cb574a8..a8ba37c 100644 --- a/views/controls/menu/native_menu_gtk.h +++ b/views/controls/menu/native_menu_gtk.h @@ -45,8 +45,8 @@ class NativeMenuGtk : public MenuWrapper { private: CHROMEGTK_CALLBACK_0(NativeMenuGtk, void, OnMenuHidden); - CHROMEGTK_CALLBACK_2(NativeMenuGtk, void, OnMenuMoveCurrent, - GtkMenuDirectionType, NativeMenuGtk*); + CHROMEGTK_CALLBACK_1(NativeMenuGtk, void, OnMenuMoveCurrent, + GtkMenuDirectionType); void AddSeparatorAt(int index); GtkWidget* AddMenuItemAt(int index, GtkRadioMenuItem* radio_group, |