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 /base/message_pump_gtk.cc | |
| 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 'base/message_pump_gtk.cc')
| -rw-r--r-- | base/message_pump_gtk.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/base/message_pump_gtk.cc b/base/message_pump_gtk.cc index e1cb7f6..f5ed042 100644 --- a/base/message_pump_gtk.cc +++ b/base/message_pump_gtk.cc @@ -5,7 +5,6 @@ #include "base/message_pump_gtk.h" #include <gtk/gtk.h> -#include <gdk/gdkx.h> namespace base { @@ -30,12 +29,6 @@ void MessagePumpGtk::DispatchEvents(GdkEvent* event) { DidProcessEvent(event); } -// static -Display* MessagePumpGtk::GetDefaultXDisplay() { - static GdkDisplay* display = gdk_display_get_default(); - return display ? GDK_DISPLAY_XDISPLAY(display) : NULL; -} - bool MessagePumpGtk::RunOnce(GMainContext* context, bool block) { // g_main_context_iteration returns true if events have been dispatched. return g_main_context_iteration(context, block); @@ -56,3 +49,4 @@ void MessagePumpGtk::EventDispatcher(GdkEvent* event, gpointer data) { } } // namespace base + |