diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 17:02:45 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 17:02:45 +0000 |
| commit | 38ab46563875871094169fb1152a8b21ebbf841f (patch) | |
| tree | 1c14d216e0c5ac5621285ea4146b1ec706958bb4 /app/gtk_signal.h | |
| parent | 9cd6def3b735220b4dd0d00ec5c8633a2dfa8acd (diff) | |
| download | chromium_src-38ab46563875871094169fb1152a8b21ebbf841f.zip chromium_src-38ab46563875871094169fb1152a8b21ebbf841f.tar.gz chromium_src-38ab46563875871094169fb1152a8b21ebbf841f.tar.bz2 | |
Reland r41641 "Make DevTools open docked by default..."
- Fix DevToolsSanityTest time out.
The timeout is because the tests wait for Browser closed notification.
However, docked DevTools does not have its own Browser object and
hence the wait times out.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1025005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/gtk_signal.h')
| -rw-r--r-- | app/gtk_signal.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/app/gtk_signal.h b/app/gtk_signal.h index e56c75d..c21ef81 100644 --- a/app/gtk_signal.h +++ b/app/gtk_signal.h @@ -26,7 +26,7 @@ typedef struct _GtkWidget GtkWidget; return reinterpret_cast<TYPE*>(userdata)->METHOD(widget); \ } \ \ - RETURN METHOD(GtkWidget* widget); + virtual RETURN METHOD(GtkWidget* widget); #define CHROMEGTK_CALLBACK_1(TYPE, RETURN, METHOD, ARG1) \ static RETURN METHOD ## Thunk(GtkWidget* widget, ARG1 one, \ @@ -34,7 +34,7 @@ typedef struct _GtkWidget GtkWidget; return reinterpret_cast<TYPE*>(userdata)->METHOD(widget, one); \ } \ \ - RETURN METHOD(GtkWidget* widget, ARG1 one); + virtual RETURN METHOD(GtkWidget* widget, ARG1 one); #define CHROMEGTK_CALLBACK_2(TYPE, RETURN, METHOD, ARG1, ARG2) \ static RETURN METHOD ## Thunk(GtkWidget* widget, ARG1 one, ARG2 two, \ @@ -42,7 +42,7 @@ typedef struct _GtkWidget GtkWidget; return reinterpret_cast<TYPE*>(userdata)->METHOD(widget, one, two); \ } \ \ - RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two); + virtual RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two); #define CHROMEGTK_CALLBACK_3(TYPE, RETURN, METHOD, ARG1, ARG2, ARG3) \ static RETURN METHOD ## Thunk(GtkWidget* widget, ARG1 one, ARG2 two, \ @@ -51,7 +51,7 @@ typedef struct _GtkWidget GtkWidget; METHOD(widget, one, two, three); \ } \ \ - RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two, ARG3 three); + virtual RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two, ARG3 three); #define CHROMEGTK_CALLBACK_4(TYPE, RETURN, METHOD, ARG1, ARG2, ARG3, ARG4) \ static RETURN METHOD ## Thunk(GtkWidget* widget, ARG1 one, ARG2 two, \ @@ -61,8 +61,8 @@ typedef struct _GtkWidget GtkWidget; METHOD(widget, one, two, three, four); \ } \ \ - RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two, ARG3 three, \ - ARG4 four); + virtual RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two, \ + ARG3 three, ARG4 four); #define CHROMEGTK_CALLBACK_5(TYPE, RETURN, METHOD, ARG1, ARG2, ARG3, ARG4, \ ARG5) \ @@ -73,8 +73,8 @@ typedef struct _GtkWidget GtkWidget; METHOD(widget, one, two, three, four, five); \ } \ \ - RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two, ARG3 three, \ - ARG4 four, ARG5 five); + virtual RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two, \ + ARG3 three, ARG4 four, ARG5 five); #define CHROMEGTK_CALLBACK_6(TYPE, RETURN, METHOD, ARG1, ARG2, ARG3, ARG4, \ ARG5, ARG6) \ @@ -85,7 +85,7 @@ typedef struct _GtkWidget GtkWidget; METHOD(widget, one, two, three, four, five, six); \ } \ \ - RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two, ARG3 three, \ - ARG4 four, ARG5 five, ARG6 six); + virtual RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two, \ + ARG3 three, ARG4 four, ARG5 five, ARG6 six); #endif // APP_GTK_SIGNAL_H_ |