Index: base/message_loop.cc |
=================================================================== |
--- base/message_loop.cc (revision 25977) |
+++ base/message_loop.cc (working copy) |
@@ -20,7 +20,7 @@ |
#include "base/message_pump_libevent.h" |
#include "base/third_party/valgrind/valgrind.h" |
#endif |
-#if defined(OS_LINUX) |
+#if defined(USE_X11) |
#include "base/message_pump_glib.h" |
#endif |
@@ -99,9 +99,9 @@ |
if (type_ == TYPE_UI) { |
#if defined(OS_MACOSX) |
pump_ = base::MessagePumpMac::Create(); |
-#elif defined(OS_LINUX) |
+#elif defined(USE_X11) |
pump_ = new base::MessagePumpForUI(); |
-#endif // OS_LINUX |
+#endif // USE_X11 |
} else if (type_ == TYPE_IO) { |
pump_ = new base::MessagePumpLibevent(); |
} else { |
@@ -188,7 +188,7 @@ |
StartHistogrammer(); |
-#if defined(OS_WIN) || defined(OS_LINUX) |
+#if defined(OS_WIN) || defined(USE_X11) |
if (state_->dispatcher && type() == TYPE_UI) { |
static_cast<base::MessagePumpForUI*>(pump_.get())-> |
RunWithDispatcher(this, state_->dispatcher); |
@@ -481,7 +481,7 @@ |
// Initialize the other fields: |
quit_received = false; |
-#if defined(OS_WIN) || defined(OS_LINUX) |
+#if defined(OS_WIN) || defined(USE_X11) |
dispatcher = NULL; |
#endif |
} |
@@ -584,7 +584,7 @@ |
#endif // defined(OS_WIN) |
-#if defined(OS_LINUX) || defined(OS_WIN) |
+#if defined(USE_X11) || defined(OS_WIN) |
void MessageLoopForUI::AddObserver(Observer* observer) { |
pump_ui()->AddObserver(observer); |
} |
@@ -598,7 +598,7 @@ |
state_->dispatcher = dispatcher; |
RunHandler(); |
} |
-#endif // defined(OS_LINUX) || defined(OS_WIN) |
+#endif // defined(USE_X11) || defined(OS_WIN) |
//------------------------------------------------------------------------------ |
// MessageLoopForIO |