Chromium Code Reviews| Index: base/message_loop/message_loop.h |
| diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h |
| index d8eae01dd5b27d16edb6a1c3f8d5557392f3d751..a2b8bed2f2e6c212448ecd8faf70d2651f79e9ba 100644 |
| --- a/base/message_loop/message_loop.h |
| +++ b/base/message_loop/message_loop.h |
| @@ -37,6 +37,16 @@ |
| #include "base/message_loop/message_pump_libevent.h" |
| #endif |
| +#if defined(OS_ANDROID) |
| +namespace base { |
| +namespace android { |
| + |
| +class JavaMessageHandlerFactory; |
| + |
| +} // namespace android |
|
danakj
2016/08/17 18:40:15
git cl format?
gsennton
2016/08/17 19:23:46
Done.
|
| +} // namespace base |
| +#endif // defined(OS_ANDROID |
|
danakj
2016/08/17 18:40:15
)
gsennton
2016/08/17 19:23:46
Done.
|
| + |
| namespace base { |
| class HistogramBase; |
| @@ -614,6 +624,11 @@ class BASE_EXPORT MessageLoopForUI : public MessageLoop { |
| // never be called. Instead use Start(), which will forward all the native UI |
| // events to the Java message loop. |
| void Start(); |
| + void StartForTesting(base::android::JavaMessageHandlerFactory* factory, |
| + WaitableEvent* test_done_event); |
| + // In Android there are cases where we want to abort immediately without |
| + // calling Quit(), in these cases we call Abort(). |
| + void Abort(); |
| #endif |
| #if defined(USE_OZONE) || (defined(USE_X11) && !defined(USE_GLIB)) |