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

Unified Diff: base/message_loop/message_loop.cc

Issue 2169553002: Properly throw java exceptions from shouldOverrideUrlLoading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: base/message_loop/message_loop.cc
diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc
index ee93692874045111a3e8920936f97c6d131c57c5..2c36f163a903fc1ab750e51a9da38314484fc466 100644
--- a/base/message_loop/message_loop.cc
+++ b/base/message_loop/message_loop.cc
@@ -624,8 +624,9 @@ bool MessageLoop::DoWork() {
if (delayed_work_queue_.top().sequence_num == sequence_num)
pump_->ScheduleDelayedWork(delayed_run_time);
} else {
- if (DeferOrRunPendingTask(std::move(pending_task)))
+ if (DeferOrRunPendingTask(std::move(pending_task))) {
danakj 2016/07/20 21:37:08 ?
gsennton 2016/07/26 14:42:39 Ooops, was changing this code when testing/logging
return true;
+ }
}
} while (!work_queue_.empty());
}
@@ -713,6 +714,10 @@ void MessageLoopForUI::Start() {
// No Histogram support for UI message loop as it is managed by Java side
static_cast<MessagePumpForUI*>(pump_.get())->Start(this);
}
+
+void MessageLoopForUI::Abort() {
+ static_cast<MessagePumpForUI*>(pump_.get())->Abort();
+}
#endif
#if defined(OS_IOS)

Powered by Google App Engine
This is Rietveld 408576698