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

Side by Side Diff: mojo/runner/child/runner_connection.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/runner/child/BUILD.gn ('k') | mojo/runner/context.cc » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "mojo/runner/child/runner_connection.h" 5 #include "mojo/runner/child/runner_connection.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/thread_task_runner_handle.h" 12 #include "base/thread_task_runner_handle.h"
13 #include "base/threading/thread.h" 13 #include "base/threading/thread.h"
14 #include "base/threading/thread_checker.h" 14 #include "base/threading/thread_checker.h"
15 #include "mojo/message_pump/message_pump_mojo.h" 15 #include "mojo/message_pump/message_pump_mojo.h"
16 #include "mojo/public/cpp/bindings/binding.h"
16 #include "mojo/runner/child/child_controller.mojom.h" 17 #include "mojo/runner/child/child_controller.mojom.h"
17 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" 18 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
18 #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" 19 #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h"
19 #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" 20 #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
20 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
21 21
22 namespace mojo { 22 namespace mojo {
23 namespace runner { 23 namespace runner {
24 namespace { 24 namespace {
25 25
26 // Blocks a thread until another thread unblocks it, at which point it unblocks 26 // Blocks a thread until another thread unblocks it, at which point it unblocks
27 // and runs a closure provided by that thread. 27 // and runs a closure provided by that thread.
28 class Blocker { 28 class Blocker {
29 public: 29 public:
30 class Unblocker { 30 class Unblocker {
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 delete connection; 248 delete connection;
249 return nullptr; 249 return nullptr;
250 } 250 }
251 return connection; 251 return connection;
252 } 252 }
253 253
254 RunnerConnection::RunnerConnection() {} 254 RunnerConnection::RunnerConnection() {}
255 255
256 } // namespace runner 256 } // namespace runner
257 } // namespace mojo 257 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/runner/child/BUILD.gn ('k') | mojo/runner/context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698