summaryrefslogtreecommitdiffstats
path: root/base/message_loop.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-27 18:17:24 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-27 18:17:24 +0000
commite5cd46b27d3591663ba43428e4b2e2249bf9733e (patch)
tree0812842b1917d201e7610412d35d31c4d3c72c80 /base/message_loop.cc
parente1a853a919b8011cec35b1ba6eb170e16f56391c (diff)
downloadchromium_src-e5cd46b27d3591663ba43428e4b2e2249bf9733e.zip
chromium_src-e5cd46b27d3591663ba43428e4b2e2249bf9733e.tar.gz
chromium_src-e5cd46b27d3591663ba43428e4b2e2249bf9733e.tar.bz2
More linux ifdef tweaks. This reverts my earlier change (13503).
BUG=none TEST=none Review URL: http://codereview.chromium.org/100046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14628 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.cc')
-rw-r--r--base/message_loop.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc
index d836c92..764a963 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -19,7 +19,7 @@
#if defined(OS_POSIX)
#include "base/message_pump_libevent.h"
#endif
-#if defined(TOOLKIT_GTK)
+#if defined(OS_LINUX)
#include "base/message_pump_glib.h"
#endif
@@ -99,11 +99,7 @@ MessageLoop::MessageLoop(Type type)
#if defined(OS_MACOSX)
pump_ = base::MessagePumpMac::Create();
#elif defined(OS_LINUX)
-#if defined(TOOLKIT_GTK)
pump_ = new base::MessagePumpForUI();
-#else
- pump_ = new base::MessagePumpDefault();
-#endif
#endif // OS_LINUX
} else if (type_ == TYPE_IO) {
pump_ = new base::MessagePumpLibevent();