Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(873)

Unified Diff: base/message_loop/message_loop.h

Issue 231643005: ozone: Remove the libevent message-pump. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/base.gypi ('k') | base/message_loop/message_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/message_loop/message_loop.h
diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h
index e52963f2533058e9e08d258c98a12a78fe98d6e6..7222df7a036524128fbe17808c4092738eefd1f2 100644
--- a/base/message_loop/message_loop.h
+++ b/base/message_loop/message_loop.h
@@ -36,8 +36,6 @@
#if defined(USE_AURA) && defined(USE_X11) && !defined(OS_NACL)
#include "base/message_loop/message_pump_x11.h"
-#elif defined(USE_OZONE) && !defined(OS_NACL)
-#include "base/message_loop/message_pump_ozone.h"
#elif !defined(OS_ANDROID_HOST)
#define USE_GTK_MESSAGE_PUMP
#include "base/message_loop/message_pump_gtk.h"
@@ -579,7 +577,7 @@ class BASE_EXPORT MessageLoopForUI : public MessageLoop {
void Start();
#endif
-#if !defined(OS_NACL) && (defined(TOOLKIT_GTK) || defined(USE_OZONE) || \
+#if !defined(OS_NACL) && (defined(TOOLKIT_GTK) || \
defined(OS_WIN) || defined(USE_X11))
// Please see message_pump_win/message_pump_glib for definitions of these
// methods.
@@ -587,13 +585,20 @@ class BASE_EXPORT MessageLoopForUI : public MessageLoop {
void RemoveObserver(Observer* observer);
#endif
+#if defined(USE_OZONE)
+ // Please see MessagePumpLibevent for definition.
+ bool WatchFileDescriptor(
+ int fd,
+ bool persistent,
+ MessagePumpLibevent::Mode mode,
+ MessagePumpLibevent::FileDescriptorWatcher* controller,
+ MessagePumpLibevent::Watcher* delegate);
+#endif
+
protected:
#if defined(USE_X11)
friend class MessagePumpX11;
#endif
-#if defined(USE_OZONE) && !defined(OS_NACL)
- friend class MessagePumpOzone;
-#endif
#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
// TODO(rvargas): Make this platform independent.
« no previous file with comments | « base/base.gypi ('k') | base/message_loop/message_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698