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

Side by Side Diff: mojo/shell/app_child_process.cc

Issue 621153003: Move mojo edk into mojo/edk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix checkdeps Created 6 years, 2 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
« no previous file with comments | « mojo/shell/DEPS ('k') | mojo/shell/app_child_process_host.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 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 "mojo/shell/app_child_process.h" 5 #include "mojo/shell/app_child_process.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
16 #include "base/scoped_native_library.h" 16 #include "base/scoped_native_library.h"
17 #include "base/single_thread_task_runner.h" 17 #include "base/single_thread_task_runner.h"
18 #include "base/synchronization/waitable_event.h" 18 #include "base/synchronization/waitable_event.h"
19 #include "base/threading/thread.h" 19 #include "base/threading/thread.h"
20 #include "base/threading/thread_checker.h" 20 #include "base/threading/thread_checker.h"
21 #include "mojo/common/message_pump_mojo.h" 21 #include "mojo/common/message_pump_mojo.h"
22 #include "mojo/embedder/embedder.h" 22 #include "mojo/edk/embedder/embedder.h"
23 #include "mojo/embedder/simple_platform_support.h" 23 #include "mojo/edk/embedder/simple_platform_support.h"
24 #include "mojo/public/cpp/system/core.h" 24 #include "mojo/public/cpp/system/core.h"
25 #include "mojo/shell/app_child_process.mojom.h" 25 #include "mojo/shell/app_child_process.mojom.h"
26 26
27 namespace mojo { 27 namespace mojo {
28 namespace shell { 28 namespace shell {
29 29
30 namespace { 30 namespace {
31 31
32 // Blocker --------------------------------------------------------------------- 32 // Blocker ---------------------------------------------------------------------
33 33
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 base::Bind(&AppChildControllerImpl::Init, base::Unretained(&app_context), 283 base::Bind(&AppChildControllerImpl::Init, base::Unretained(&app_context),
284 base::Passed(platform_channel()), blocker.GetUnblocker())); 284 base::Passed(platform_channel()), blocker.GetUnblocker()));
285 // This will block, then run whatever the controller wants. 285 // This will block, then run whatever the controller wants.
286 blocker.Block(); 286 blocker.Block();
287 287
288 app_context.Shutdown(); 288 app_context.Shutdown();
289 } 289 }
290 290
291 } // namespace shell 291 } // namespace shell
292 } // namespace mojo 292 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/DEPS ('k') | mojo/shell/app_child_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698