Chromium Code Reviews| 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..8710e401fe508a239312b442aa6d486ec27602d5 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,25 @@ |
| #include "content/public/browser/render_process_host.h" |
| #include "third_party/WebKit/public/web/WebBindings.h" |
| +#if defined(OS_ANDROID) |
| +#include "base/android/java_thread.h" |
|
benm (inactive)
2013/07/17 10:52:29
nit, maybe a comment here to say that we require a
Kristian Monsen
2013/07/17 21:02:37
Sure, will add a comment. I don't think it is just
|
| +#else |
| +#include "base/threading/thread.h" |
| +#endif |
| + |
| + |
| +#if defined(OS_ANDROID) |
| +typedef base::android::JavaThread 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() { |