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

Side by Side Diff: base/threading/thread.cc

Issue 10383256: Revert 138014 - Base: Don't overwrite the thread id when ThreadMain exits. There's (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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) 2011 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_local.h" 10 #include "base/threading/thread_local.h"
11 #include "base/threading/thread_restrictions.h" 11 #include "base/threading/thread_restrictions.h"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 164
165 // Let the thread do extra cleanup. 165 // Let the thread do extra cleanup.
166 CleanUp(); 166 CleanUp();
167 167
168 // Assert that MessageLoop::Quit was called by ThreadQuitHelper. 168 // Assert that MessageLoop::Quit was called by ThreadQuitHelper.
169 DCHECK(GetThreadWasQuitProperly()); 169 DCHECK(GetThreadWasQuitProperly());
170 170
171 // We can't receive messages anymore. 171 // We can't receive messages anymore.
172 message_loop_ = NULL; 172 message_loop_ = NULL;
173 } 173 }
174 thread_id_ = kInvalidThreadId;
174 } 175 }
175 176
176 } // namespace base 177 } // namespace base
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698