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

Side by Side Diff: mojo/public/cpp/utility/lib/thread.cc

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 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
« no previous file with comments | « mojo/public/cpp/utility/lib/run_loop.cc ('k') | mojo/public/cpp/utility/lib/thread_local.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "third_party/mojo/src/mojo/public/cpp/utility/thread.h" 5 #include "mojo/public/cpp/utility/thread.h"
6 6
7 #include <assert.h> 7 #include <assert.h>
8 8
9 namespace mojo { 9 namespace mojo {
10 10
11 Thread::Thread() : options_(), thread_(), started_(false), joined_(false) { 11 Thread::Thread() : options_(), thread_(), started_(false), joined_(false) {
12 } 12 }
13 13
14 Thread::Thread(const Options& options) 14 Thread::Thread(const Options& options)
15 : options_(options), thread_(), started_(false), joined_(false) { 15 : options_(options), thread_(), started_(false), joined_(false) {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 } 55 }
56 56
57 // static 57 // static
58 void* Thread::ThreadRunTrampoline(void* arg) { 58 void* Thread::ThreadRunTrampoline(void* arg) {
59 Thread* self = static_cast<Thread*>(arg); 59 Thread* self = static_cast<Thread*>(arg);
60 self->Run(); 60 self->Run();
61 return nullptr; 61 return nullptr;
62 } 62 }
63 63
64 } // namespace mojo 64 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/public/cpp/utility/lib/run_loop.cc ('k') | mojo/public/cpp/utility/lib/thread_local.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698