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..6e7df5dee97dc0abb308be0432734c6994e1fc43 100644 |
| --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc |
| +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc |
| @@ -4,9 +4,14 @@ |
| #include "content/browser/renderer_host/java/java_bridge_dispatcher_host.h" |
| +#ifdef ANDROID |
| +#include "base/android/java_thread.h" |
| +#endif |
|
benm (inactive)
2013/07/10 16:50:06
I think conditional includes go at the bottom in a
Kristian Monsen
2013/07/10 17:50:19
You are right, did not know this :-) Makes the log
|
| #include "base/bind.h" |
| #include "base/lazy_instance.h" |
| +#ifndef ANDROID |
| #include "base/threading/thread.h" |
| +#endif |
| #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 +22,18 @@ |
| #include "content/public/browser/render_process_host.h" |
| #include "third_party/WebKit/public/web/WebBindings.h" |
| +#ifdef ANDROID |
| +#define THREAD base::android::JavaThread |
| +#else |
| +#define THREAD base::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() { |