forked from sanyaade-mobiledev/chromium.src
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move glib headers in ui/base/gtk/ to ui/base/glib/.
- Moved ui/base/gtk/gtk_integers.h to ui/base/glib/glib_integers.h since the header only contains typedefs in <glib/glibtypes.h> and does not depend Gtk+ at all. - Moved the first half of ui/base/gtk/gtk_signal.h to ui/base/glib/glib_signal.h since it does not depend on Gtk+ as well. This CL is part of the Gtk+ removal work (crbug.com/101422) BUG=chromium:101422 TEST=ran try Review URL: http://codereview.chromium.org/8494001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108948 0039d316-1c4b-4281-b951-d872f2087c98
- Loading branch information
yusukes@chromium.org
committed
Nov 8, 2011
1 parent
d96ee58
commit 0117a81
Showing
12 changed files
with
107 additions
and
95 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| // Copyright (c) 2011 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #ifndef UI_BASE_GLIB_GLIB_SIGNAL_H_ | ||
| #define UI_BASE_GLIB_GLIB_SIGNAL_H_ | ||
| #pragma once | ||
|
|
||
| typedef void* gpointer; | ||
|
|
||
| // At the time of writing this, there were two common ways of binding our C++ | ||
| // code to the gobject C system. We either defined a whole bunch of "static | ||
| // MethodThunk()" which just called nonstatic Method()s on a class (which hurt | ||
| // readability of the headers and signal connection code) OR we declared | ||
| // "static Method()" and passed in the current object as the gpointer (and hurt | ||
| // readability in the implementation by having "context->" before every | ||
| // variable). | ||
|
|
||
| // The hopeful result of using these macros is that the code will be more | ||
| // readable and regular. There shouldn't be a bunch of static Thunks visible in | ||
| // the headers and the implementations shouldn't be filled with "context->" | ||
| // de-references. | ||
|
|
||
| #define CHROMEG_CALLBACK_0(CLASS, RETURN, METHOD, SENDER) \ | ||
| static RETURN METHOD ## Thunk(SENDER sender, gpointer userdata) { \ | ||
| return reinterpret_cast<CLASS*>(userdata)->METHOD(sender); \ | ||
| } \ | ||
| \ | ||
| virtual RETURN METHOD(SENDER); | ||
|
|
||
| #define CHROMEG_CALLBACK_1(CLASS, RETURN, METHOD, SENDER, ARG1) \ | ||
| static RETURN METHOD ## Thunk(SENDER sender, ARG1 one, \ | ||
| gpointer userdata) { \ | ||
| return reinterpret_cast<CLASS*>(userdata)->METHOD(sender, one); \ | ||
| } \ | ||
| \ | ||
| virtual RETURN METHOD(SENDER, ARG1); | ||
|
|
||
| #define CHROMEG_CALLBACK_2(CLASS, RETURN, METHOD, SENDER, ARG1, ARG2) \ | ||
| static RETURN METHOD ## Thunk(SENDER sender, ARG1 one, ARG2 two, \ | ||
| gpointer userdata) { \ | ||
| return reinterpret_cast<CLASS*>(userdata)->METHOD(sender, one, two); \ | ||
| } \ | ||
| \ | ||
| virtual RETURN METHOD(SENDER, ARG1, ARG2); | ||
|
|
||
| #define CHROMEG_CALLBACK_3(CLASS, RETURN, METHOD, SENDER, ARG1, ARG2, ARG3) \ | ||
| static RETURN METHOD ## Thunk(SENDER sender, ARG1 one, ARG2 two, \ | ||
| ARG3 three, gpointer userdata) { \ | ||
| return reinterpret_cast<CLASS*>(userdata)-> \ | ||
| METHOD(sender, one, two, three); \ | ||
| } \ | ||
| \ | ||
| virtual RETURN METHOD(SENDER, ARG1, ARG2, ARG3); | ||
|
|
||
| #define CHROMEG_CALLBACK_4(CLASS, RETURN, METHOD, SENDER, ARG1, ARG2, ARG3, \ | ||
| ARG4) \ | ||
| static RETURN METHOD ## Thunk(SENDER sender, ARG1 one, ARG2 two, \ | ||
| ARG3 three, ARG4 four, \ | ||
| gpointer userdata) { \ | ||
| return reinterpret_cast<CLASS*>(userdata)-> \ | ||
| METHOD(sender, one, two, three, four); \ | ||
| } \ | ||
| \ | ||
| virtual RETURN METHOD(SENDER, ARG1, ARG2, ARG3, ARG4); | ||
|
|
||
| #define CHROMEG_CALLBACK_5(CLASS, RETURN, METHOD, SENDER, ARG1, ARG2, ARG3, \ | ||
| ARG4, ARG5) \ | ||
| static RETURN METHOD ## Thunk(SENDER sender, ARG1 one, ARG2 two, \ | ||
| ARG3 three, ARG4 four, ARG5 five, \ | ||
| gpointer userdata) { \ | ||
| return reinterpret_cast<CLASS*>(userdata)-> \ | ||
| METHOD(sender, one, two, three, four, five); \ | ||
| } \ | ||
| \ | ||
| virtual RETURN METHOD(SENDER, ARG1, ARG2, ARG3, ARG4, ARG5); | ||
|
|
||
| #define CHROMEG_CALLBACK_6(CLASS, RETURN, METHOD, SENDER, ARG1, ARG2, ARG3, \ | ||
| ARG4, ARG5, ARG6) \ | ||
| static RETURN METHOD ## Thunk(SENDER sender, ARG1 one, ARG2 two, \ | ||
| ARG3 three, ARG4 four, ARG5 five, \ | ||
| ARG6 six, gpointer userdata) { \ | ||
| return reinterpret_cast<CLASS*>(userdata)-> \ | ||
| METHOD(sender, one, two, three, four, five, six); \ | ||
| } \ | ||
| \ | ||
| virtual RETURN METHOD(SENDER, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6); | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters