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

Side by Side 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: 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 unified diff | Download patch | Annotate | Revision Log
« base/threading/thread.h ('K') | « base/threading/thread.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "base/threading/thread.h" 5 #include "base/threading/thread.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" 9 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
10 #include "base/threading/thread_id_name_manager.h" 10 #include "base/threading/thread_id_name_manager.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 quit_properly = lazy_tls_bool.Pointer()->Get(); 168 quit_properly = lazy_tls_bool.Pointer()->Get();
169 #endif 169 #endif
170 return quit_properly; 170 return quit_properly;
171 } 171 }
172 172
173 void Thread::ThreadMain() { 173 void Thread::ThreadMain() {
174 { 174 {
175 // The message loop for this thread. 175 // The message loop for this thread.
176 // Allocated on the heap to centralize any leak reports at this line. 176 // Allocated on the heap to centralize any leak reports at this line.
177 scoped_ptr<MessageLoop> message_loop( 177 scoped_ptr<MessageLoop> message_loop(
178 new MessageLoop(startup_data_->options.message_loop_type)); 178 new MessageLoop(startup_data_->options.message_loop_type,
179 startup_data_->options.message_pump));
179 180
180 // Complete the initialization of our Thread object. 181 // Complete the initialization of our Thread object.
181 thread_id_ = PlatformThread::CurrentId(); 182 thread_id_ = PlatformThread::CurrentId();
182 PlatformThread::SetName(name_.c_str()); 183 PlatformThread::SetName(name_.c_str());
183 ANNOTATE_THREAD_NAME(name_.c_str()); // Tell the name to race detector. 184 ANNOTATE_THREAD_NAME(name_.c_str()); // Tell the name to race detector.
184 message_loop->set_thread_name(name_); 185 message_loop->set_thread_name(name_);
185 message_loop_ = message_loop.get(); 186 message_loop_ = message_loop.get();
186 187
187 #if defined(OS_WIN) 188 #if defined(OS_WIN)
188 scoped_ptr<win::ScopedCOMInitializer> com_initializer; 189 scoped_ptr<win::ScopedCOMInitializer> com_initializer;
(...skipping 25 matching lines...) Expand all
214 215
215 // Assert that MessageLoop::Quit was called by ThreadQuitHelper. 216 // Assert that MessageLoop::Quit was called by ThreadQuitHelper.
216 DCHECK(GetThreadWasQuitProperly()); 217 DCHECK(GetThreadWasQuitProperly());
217 218
218 // We can't receive messages anymore. 219 // We can't receive messages anymore.
219 message_loop_ = NULL; 220 message_loop_ = NULL;
220 } 221 }
221 } 222 }
222 223
223 } // namespace base 224 } // namespace base
OLDNEW
« base/threading/thread.h ('K') | « base/threading/thread.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698