Index: content/browser/renderer_host/java/java_bridge_dispatcher_host.cc |
diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc |
index c47414bec70917d03c7b263190bc45c76f652a37..b015952c3b9bf9488ba2f7329f6764bb45d33db8 100644 |
--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc |
+++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc |
@@ -6,7 +6,6 @@ |
#include "base/bind.h" |
#include "base/lazy_instance.h" |
-#include "base/threading/thread.h" |
#include "content/browser/renderer_host/java/java_bridge_channel_host.h" |
#include "content/browser/renderer_host/render_view_host_impl.h" |
#include "content/child/child_process.h" |
@@ -17,12 +16,26 @@ |
#include "content/public/browser/render_process_host.h" |
#include "third_party/WebKit/public/web/WebBindings.h" |
+#if defined(OS_ANDROID) |
+#include "base/android/java_handler_thread.h" |
+#else |
+#include "base/threading/thread.h" |
joth
2013/07/17 21:16:19
I don't see what purpose this is serving - I don't
Kristian Monsen
2013/07/17 21:54:40
True, updated.
|
+#endif |
+ |
+// Android needs to use a Java thread so the callback |
+// will happen on a thread with a prepared Looper. |
+#if defined(OS_ANDROID) |
+typedef base::android::JavaHandlerThread THREAD; |
+#else |
+typedef base::Thread THREAD; |
+#endif |
+ |
namespace content { |
namespace { |
-class JavaBridgeThread : public base::Thread { |
+class JavaBridgeThread : public THREAD { |
public: |
- JavaBridgeThread() : base::Thread("JavaBridge") { |
+ JavaBridgeThread() : THREAD("JavaBridge") { |
Start(); |
} |
virtual ~JavaBridgeThread() { |