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

Unified Diff: base/threading/thread.cc

Issue 61643006: Adds the ability for MessageLoop to take a MessagePump (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: TYPE_CUSTOM and some scoped_ptr Created 7 years, 1 month 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/threading/thread.cc
diff --git a/base/threading/thread.cc b/base/threading/thread.cc
index aca4ddbaa02a11c37ef02b39b5e4c3da829f404e..a49c73a5a7393ae209396b1bd848af5cc3cfadca 100644
--- a/base/threading/thread.cc
+++ b/base/threading/thread.cc
@@ -174,8 +174,15 @@ void Thread::ThreadMain() {
{
// The message loop for this thread.
// Allocated on the heap to centralize any leak reports at this line.
- scoped_ptr<MessageLoop> message_loop(
- new MessageLoop(startup_data_->options.message_loop_type));
+ scoped_ptr<MessageLoop> message_loop;
+ if (startup_data_->options.message_pump) {
+ message_loop.reset(new MessageLoop(
+ scoped_ptr<base::MessagePump>(
+ startup_data_->options.message_pump)));
+ } else {
+ message_loop.reset(
+ new MessageLoop(startup_data_->options.message_loop_type));
+ }
// Complete the initialization of our Thread object.
thread_id_ = PlatformThread::CurrentId();

Powered by Google App Engine
This is Rietveld 408576698