| Index: ui/base/x/x11_util.cc
|
| diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc
|
| index aa11de8a78e7a5cba96ea19f6ca46780dd5bf640..98faee5376d0acc279711d4fe8871fe20a4edc0e 100644
|
| --- a/ui/base/x/x11_util.cc
|
| +++ b/ui/base/x/x11_util.cc
|
| @@ -80,15 +80,6 @@ int DefaultX11IOErrorHandler(Display* d) {
|
| _exit(1);
|
| }
|
|
|
| -Atom GetAtom(const char* name) {
|
| -#if defined(TOOLKIT_USES_GTK)
|
| - return gdk_x11_get_xatom_by_name_for_display(
|
| - gdk_display_get_default(), name);
|
| -#else
|
| - return XInternAtom(GetXDisplay(), name, false);
|
| -#endif
|
| -}
|
| -
|
| // Note: The caller should free the resulting value data.
|
| bool GetProperty(XID window, const std::string& property_name, long max_length,
|
| Atom* type, int* format, unsigned long* num_items,
|
| @@ -429,6 +420,15 @@ bool GetStringProperty(
|
| return true;
|
| }
|
|
|
| +Atom GetAtom(const char* name) {
|
| +#if defined(TOOLKIT_USES_GTK)
|
| + return gdk_x11_get_xatom_by_name_for_display(
|
| + gdk_display_get_default(), name);
|
| +#else
|
| + return XInternAtom(GetXDisplay(), name, false);
|
| +#endif
|
| +}
|
| +
|
| XID GetParentWindow(XID window) {
|
| XID root = None;
|
| XID parent = None;
|
|
|