diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 07:24:49 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 07:24:49 +0000 |
| commit | d33a47ce26330b024214b0ecfb8b2c5cda218233 (patch) | |
| tree | cf2e53aa1f65c379095199c252c20630553c775d /app/gtk_signal.h | |
| parent | 7b7bbbe82533e74b60a924dc4d563f6d3f07482c (diff) | |
| download | chromium_src-d33a47ce26330b024214b0ecfb8b2c5cda218233.zip chromium_src-d33a47ce26330b024214b0ecfb8b2c5cda218233.tar.gz chromium_src-d33a47ce26330b024214b0ecfb8b2c5cda218233.tar.bz2 | |
Revert "Make DevTools open docked by default for chrome os."
This reverts commit r41641 because all the devtools interactive_ui_tests
are failing.
TBR=xiyuan
Review URL: http://codereview.chromium.org/1007004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41691 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 c21ef81..e56c75d 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); \ } \ \ - virtual RETURN METHOD(GtkWidget* widget); + 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); \ } \ \ - virtual RETURN METHOD(GtkWidget* widget, ARG1 one); + 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); \ } \ \ - virtual RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two); + 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); \ } \ \ - virtual RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two, ARG3 three); + 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); \ } \ \ - virtual RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two, \ - ARG3 three, ARG4 four); + 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); \ } \ \ - virtual RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two, \ - ARG3 three, ARG4 four, ARG5 five); + 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); \ } \ \ - virtual RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two, \ - ARG3 three, ARG4 four, ARG5 five, ARG6 six); + RETURN METHOD(GtkWidget* widget, ARG1 one, ARG2 two, ARG3 three, \ + ARG4 four, ARG5 five, ARG6 six); #endif // APP_GTK_SIGNAL_H_ |