diff options
Diffstat (limited to 'chromium/ui/gfx/x/x11_types.cc')
| -rw-r--r-- | chromium/ui/gfx/x/x11_types.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chromium/ui/gfx/x/x11_types.cc b/chromium/ui/gfx/x/x11_types.cc index 7540f8ae288..531190e1321 100644 --- a/chromium/ui/gfx/x/x11_types.cc +++ b/chromium/ui/gfx/x/x11_types.cc @@ -11,13 +11,21 @@ #include "build/build_config.h" #include "ui/gfx/x/x11_switches.h" +#ifdef TOOLKIT_QT +extern XDisplay* GetQtXDisplay(); +#endif + namespace gfx { XDisplay* GetXDisplay() { +#ifdef TOOLKIT_QT + return GetQtXDisplay(); +#else static XDisplay* display = NULL; if (!display) display = OpenNewXDisplay(); return display; +#endif } XDisplay* OpenNewXDisplay() { |