diff options
| author | leandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 15:24:04 +0000 |
|---|---|---|
| committer | leandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 15:24:04 +0000 |
| commit | bdab20fe8a247e0a3d825507ba4849331c26dfdc (patch) | |
| tree | bca0a220edd9ac95ef666e4148144d71064c6b7e /ui/base/x | |
| parent | 6490abc1d558d262e1a4ab2125967a5afd0eb430 (diff) | |
| download | chromium_src-bdab20fe8a247e0a3d825507ba4849331c26dfdc.zip chromium_src-bdab20fe8a247e0a3d825507ba4849331c26dfdc.tar.gz chromium_src-bdab20fe8a247e0a3d825507ba4849331c26dfdc.tar.bz2 | |
Revert 93629 - Linux build failure: http://build.chromium.org/p/chromium/builders/Linux%20Builder%20%28dbg%29%28shared%29/builds/4098/steps/compile/logs/stdio#error1
Consolidate access to X Display
Change ui::GetXDisplay to use the MessagePumpForUI class
to get Display. This allows us to have two different
implementation for x and gtk.
Remove MessageLoop::GetDisplay from message loop API.
Client should use ui::GetXDisplay instead. This
will also be removed in near future, and client should get
display from window it is dealing with.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7484006
TBR=oshima@google.com
Review URL: http://codereview.chromium.org/7493014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/x')
| -rw-r--r-- | ui/base/x/x11_util.cc | 8 | ||||
| -rw-r--r-- | ui/base/x/x11_util.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc index d7d51cf..51f52e2 100644 --- a/ui/base/x/x11_util.cc +++ b/ui/base/x/x11_util.cc @@ -20,7 +20,6 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/message_loop.h" #include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/threading/thread.h" @@ -97,7 +96,12 @@ bool XDisplayExists() { } Display* GetXDisplay() { - return base::MessagePumpForUI::GetDefaultXDisplay(); + static Display* display = NULL; + + if (!display) + display = gdk_x11_get_default_xdisplay(); + + return display; } static SharedMemorySupport DoQuerySharedMemorySupport(Display* dpy) { diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h index 6728c1e..ab455a0 100644 --- a/ui/base/x/x11_util.h +++ b/ui/base/x/x11_util.h @@ -39,10 +39,6 @@ namespace ui { // Check if there's an open connection to an X server. UI_API bool XDisplayExists(); // Return an X11 connection for the current, primary display. - -// TODO(oshima|evan): This assume there is one display and dosn't work -// undef mutiple displays/monitor environment. Remove this and change the -// chrome codebase to get the display from window. UI_API Display* GetXDisplay(); // X shared memory comes in three flavors: |