commit 7aff5f6a2fae435fb4b6969ae84d6c5a4ad7b3d8
author sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Apr 11 02:19:38 2014 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 16:27:12 2020 +0900
tree c03aac39f12010daa52056964952dfddccbf7c83
parent bc3948f0b9e92fb855de95af432a33cdd1bd490e

ozone: Remove the libevent message-pump.

The ozone message-pump is no longer needed. So remove that, and use the default
message-pump based on libevent instead. Also, add a convenience method for
adding a watcher on a file-descriptor to the message-pump from the message-loop.

BUG=354062
R=rjkroege@chromium.org, sky@chromium.org
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/231643005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263022 0039d316-1c4b-4281-b951-d872f2087c98


CrOS-Libchrome-Original-Commit: ef1a61b3ca42b158068c27e722630d881eb5fa1e

base/message_loop/message_loop.h

diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h
index e52963f..7222df7 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 @@
   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 @@
   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.