Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(528)

Side by Side Diff: base/message_loop/message_pump_android.h

Issue 2169553002: Properly throw java exceptions from shouldOverrideUrlLoading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Better separation of production and test code, and minor cleanups. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef BASE_MESSAGE_LOOP_MESSAGE_PUMP_ANDROID_H_ 5 #ifndef BASE_MESSAGE_LOOP_MESSAGE_PUMP_ANDROID_H_
6 #define BASE_MESSAGE_LOOP_MESSAGE_PUMP_ANDROID_H_ 6 #define BASE_MESSAGE_LOOP_MESSAGE_PUMP_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
11 #include "base/base_export.h" 11 #include "base/base_export.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/message_loop/message_pump.h" 14 #include "base/message_loop/message_pump.h"
15 #include "base/synchronization/waitable_event.h"
15 16
16 namespace base { 17 namespace base {
17 18
18 class RunLoop; 19 class RunLoop;
19 class TimeTicks; 20 class TimeTicks;
20 21
21 // This class implements a MessagePump needed for TYPE_UI MessageLoops on 22 // This class implements a MessagePump needed for TYPE_UI MessageLoops on
22 // OS_ANDROID platform. 23 // OS_ANDROID platform.
23 class BASE_EXPORT MessagePumpForUI : public MessagePump { 24 class BASE_EXPORT MessagePumpForUI : public MessagePump {
24 public: 25 public:
25 MessagePumpForUI(); 26 MessagePumpForUI();
26 ~MessagePumpForUI() override; 27 ~MessagePumpForUI() override;
27 28
28 void Run(Delegate* delegate) override; 29 void Run(Delegate* delegate) override;
29 void Quit() override; 30 void Quit() override;
30 void ScheduleWork() override; 31 void ScheduleWork() override;
31 void ScheduleDelayedWork(const TimeTicks& delayed_work_time) override; 32 void ScheduleDelayedWork(const TimeTicks& delayed_work_time) override;
32 33
33 virtual void Start(Delegate* delegate); 34 virtual void Start(Delegate* delegate);
35 void StartForTesting(Delegate* delegate, WaitableEvent* test_done_event);
36
37 // We call Abort when there is a pending JNI exception, meaning that the
38 // current thread will crash when we return to Java.
39 // We can't call any jni-methods before returning to Java as we would then
40 // cause a native crash (instead of the original Java crash)
41 void Abort() { should_abort_ = true; }
42 bool ShouldAbort() const { return should_abort_; }
43
44 void NotifyTestDone();
34 45
35 static bool RegisterBindings(JNIEnv* env); 46 static bool RegisterBindings(JNIEnv* env);
36 47
37 private: 48 private:
38 RunLoop* run_loop_; 49 RunLoop* run_loop_;
39 base::android::ScopedJavaGlobalRef<jobject> system_message_handler_obj_; 50 base::android::ScopedJavaGlobalRef<jobject> system_message_handler_obj_;
51 bool should_abort_;
52 // An event that is triggered when we catch a certain test exception in
53 // SystemMessageHandler, this event is only used in tests.
54 WaitableEvent* test_event_;
40 55
41 DISALLOW_COPY_AND_ASSIGN(MessagePumpForUI); 56 DISALLOW_COPY_AND_ASSIGN(MessagePumpForUI);
42 }; 57 };
43 58
44 } // namespace base 59 } // namespace base
45 60
46 #endif // BASE_MESSAGE_LOOP_MESSAGE_PUMP_ANDROID_H_ 61 #endif // BASE_MESSAGE_LOOP_MESSAGE_PUMP_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698