Android's paths and message loop implementation with JNI
BUG=
TEST=
Review URL: http://codereview.chromium.org/7518032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95085 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 61c86c6a23ab32e81337f66f1b958d8ec3e8bd45
diff --git a/base/message_loop.cc b/base/message_loop.cc
index e3f6ea3..9cef7bf 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -25,8 +25,10 @@
#if defined(OS_POSIX)
#include "base/message_pump_libevent.h"
#endif
-
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_ANDROID)
+#include "base/message_pump_android.h"
+#endif
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#if defined(TOUCH_UI)
@@ -85,6 +87,8 @@
bool enable_histogrammer_ = false;
+MessageLoop::MessagePumpFactory* message_pump_for_ui_factory_ = NULL;
+
} // namespace
//------------------------------------------------------------------------------
@@ -143,6 +147,9 @@
#elif defined(OS_MACOSX)
#define MESSAGE_PUMP_UI base::MessagePumpMac::Create()
#define MESSAGE_PUMP_IO new base::MessagePumpLibevent()
+#elif defined(OS_ANDROID)
+#define MESSAGE_PUMP_UI new base::MessagePumpForUI()
+#define MESSAGE_PUMP_IO new base::MessagePumpLibevent()
#elif defined(TOUCH_UI)
#define MESSAGE_PUMP_UI new base::MessagePumpX()
#define MESSAGE_PUMP_IO new base::MessagePumpLibevent()
@@ -159,7 +166,10 @@
#endif
if (type_ == TYPE_UI) {
- pump_ = MESSAGE_PUMP_UI;
+ if (message_pump_for_ui_factory_)
+ pump_ = message_pump_for_ui_factory_();
+ else
+ pump_ = MESSAGE_PUMP_UI;
} else if (type_ == TYPE_IO) {
pump_ = MESSAGE_PUMP_IO;
} else {
@@ -221,6 +231,12 @@
enable_histogrammer_ = enable;
}
+// static
+void MessageLoop::InitMessagePumpForUIFactory(MessagePumpFactory* factory) {
+ DCHECK(!message_pump_for_ui_factory_);
+ message_pump_for_ui_factory_ = factory;
+}
+
void MessageLoop::AddDestructionObserver(
DestructionObserver* destruction_observer) {
DCHECK_EQ(this, current());
@@ -410,7 +426,7 @@
StartHistogrammer();
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
if (state_->dispatcher && type() == TYPE_UI) {
static_cast<base::MessagePumpForUI*>(pump_.get())->
RunWithDispatcher(this, state_->dispatcher);
@@ -724,7 +740,7 @@
// Initialize the other fields:
quit_received = false;
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
dispatcher = NULL;
#endif
}
@@ -780,7 +796,14 @@
}
#endif // defined(OS_WIN)
-#if !defined(OS_MACOSX) && !defined(OS_NACL)
+#if defined(OS_ANDROID)
+void MessageLoopForUI::Start() {
+ // No Histogram support for UI message loop as it is managed by Java side
+ static_cast<base::MessagePumpForUI*>(pump_.get())->Start(this);
+}
+#endif
+
+#if !defined(OS_MACOSX) && !defined(OS_NACL) && !defined(OS_ANDROID)
void MessageLoopForUI::AddObserver(Observer* observer) {
pump_ui()->AddObserver(observer);
}
@@ -794,7 +817,7 @@
state_->dispatcher = dispatcher;
RunHandler();
}
-#endif // !defined(OS_MACOSX) && !defined(OS_NACL)
+#endif // !defined(OS_MACOSX) && !defined(OS_NACL) && !defined(OS_ANDROID)
//------------------------------------------------------------------------------
// MessageLoopForIO