| Index: ui/base/x/x11_util.h
|
| diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h
|
| index 64e7d648df1551ae802157afafcfccbfa3b6cf13..771e8ef3705359fb276788b27601e7f97053c089 100644
|
| --- a/ui/base/x/x11_util.h
|
| +++ b/ui/base/x/x11_util.h
|
| @@ -26,7 +26,7 @@ typedef struct _XDisplay Display;
|
| typedef unsigned long Cursor;
|
| typedef struct _XcursorImage XcursorImage;
|
|
|
| -#if defined(TOOLKIT_USES_GTK)
|
| +#if defined(TOOLKIT_GTK)
|
| typedef struct _GdkDrawable GdkWindow;
|
| typedef struct _GtkWidget GtkWidget;
|
| typedef struct _GtkWindow GtkWindow;
|
| @@ -99,7 +99,7 @@ UI_EXPORT XID GetX11RootWindow();
|
| // Returns the user's current desktop.
|
| bool GetCurrentDesktop(int* desktop);
|
|
|
| -#if defined(TOOLKIT_USES_GTK)
|
| +#if defined(TOOLKIT_GTK)
|
| // Get the X window id for the given GTK widget.
|
| UI_EXPORT XID GetX11WindowFromGtkWidget(GtkWidget* widget);
|
| XID GetX11WindowFromGdkWindow(GdkWindow* window);
|
| @@ -112,7 +112,7 @@ UI_EXPORT GtkWindow* GetGtkWindowFromX11Window(XID xid);
|
| // Get a Visual from the given widget. Since we don't include the Xlib
|
| // headers, this is returned as a void*.
|
| UI_EXPORT void* GetVisualFromGtkWidget(GtkWidget* widget);
|
| -#endif // defined(TOOLKIT_USES_GTK)
|
| +#endif // defined(TOOLKIT_GTK)
|
|
|
| // Return the number of bits-per-pixel for a pixmap of the given depth
|
| UI_EXPORT int BitsPerPixelForPixmapDepth(Display* display, int depth);
|
|
|