diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 17:36:57 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 17:36:57 +0000 |
| commit | 532ecbb769085fa7000b9013dc831c71644e116a (patch) | |
| tree | 5a9a69eaec30a2fe6ebf9731008ea45dfb6893e0 /views/controls/menu/native_menu_gtk.h | |
| parent | a8f18aebeb708553cb1cea888213c77837102ae6 (diff) | |
| download | chromium_src-532ecbb769085fa7000b9013dc831c71644e116a.zip chromium_src-532ecbb769085fa7000b9013dc831c71644e116a.tar.gz chromium_src-532ecbb769085fa7000b9013dc831c71644e116a.tar.bz2 | |
estade:- This revert is to fix interactive ui test failures which have been broken since Wednesday. Your CL
is not at fault though. 42498 seems to be the culprit. I had to revert your CL as it leads to conflicts while
reverting 42498
Revert 42703 - Views: fix a crash where in the browser actions container.
This crash didn't actually affect linux/views (for some reason the RunContextMenu() call seems to never return).
BUG=38964
TEST=crash an extension while the context menu for it is showing.
Review URL: http://codereview.chromium.org/1237004
TBR=estade@chromium.org
Review URL: http://codereview.chromium.org/1423002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/native_menu_gtk.h')
| -rw-r--r-- | views/controls/menu/native_menu_gtk.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/views/controls/menu/native_menu_gtk.h b/views/controls/menu/native_menu_gtk.h index a8ba37c..812fbad 100644 --- a/views/controls/menu/native_menu_gtk.h +++ b/views/controls/menu/native_menu_gtk.h @@ -9,7 +9,6 @@ #include <vector> -#include "app/gtk_signal.h" #include "base/task.h" #include "views/controls/menu/menu_wrapper.h" @@ -44,9 +43,10 @@ class NativeMenuGtk : public MenuWrapper { virtual void RemoveMenuListener(MenuListener* listener); private: - CHROMEGTK_CALLBACK_0(NativeMenuGtk, void, OnMenuHidden); - CHROMEGTK_CALLBACK_1(NativeMenuGtk, void, OnMenuMoveCurrent, - GtkMenuDirectionType); + static void OnMenuHidden(GtkWidget* widget, NativeMenuGtk* menu); + static void OnMenuMoveCurrent(GtkMenu* widget, + GtkMenuDirectionType focus_direction, + NativeMenuGtk* menu); void AddSeparatorAt(int index); GtkWidget* AddMenuItemAt(int index, GtkRadioMenuItem* radio_group, |