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

Side by Side Diff: mojo/shell/app_child_process_host.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/app_child_process.cc ('k') | mojo/shell/child_process.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 "mojo/shell/app_child_process_host.h" 5 #include "mojo/shell/app_child_process_host.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "mojo/embedder/embedder.h" 10 #include "mojo/edk/embedder/embedder.h"
11 #include "mojo/public/cpp/system/core.h" 11 #include "mojo/public/cpp/system/core.h"
12 #include "mojo/shell/context.h" 12 #include "mojo/shell/context.h"
13 #include "mojo/shell/task_runners.h" 13 #include "mojo/shell/task_runners.h"
14 14
15 namespace mojo { 15 namespace mojo {
16 namespace shell { 16 namespace shell {
17 17
18 AppChildProcessHost::AppChildProcessHost( 18 AppChildProcessHost::AppChildProcessHost(
19 Context* context, 19 Context* context,
20 AppChildControllerClient* controller_client) 20 AppChildControllerClient* controller_client)
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 void AppChildProcessHost::DidCreateChannel( 54 void AppChildProcessHost::DidCreateChannel(
55 embedder::ChannelInfo* channel_info) { 55 embedder::ChannelInfo* channel_info) {
56 DVLOG(2) << "AppChildProcessHost::DidCreateChannel()"; 56 DVLOG(2) << "AppChildProcessHost::DidCreateChannel()";
57 57
58 CHECK(channel_info); 58 CHECK(channel_info);
59 channel_info_ = channel_info; 59 channel_info_ = channel_info;
60 } 60 }
61 61
62 } // namespace shell 62 } // namespace shell
63 } // namespace mojo 63 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/app_child_process.cc ('k') | mojo/shell/child_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698