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

Side by Side Diff: mojo/shell/external_application_registrar_connection.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
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/external_application_registrar_connection.h" 5 #include "mojo/shell/external_application_registrar_connection.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "mojo/embedder/channel_init.h" 11 #include "mojo/edk/embedder/channel_init.h"
12 #include "mojo/public/cpp/bindings/error_handler.h" 12 #include "mojo/public/cpp/bindings/error_handler.h"
13 #include "mojo/public/interfaces/application/application.mojom.h" 13 #include "mojo/public/interfaces/application/application.mojom.h"
14 #include "mojo/public/interfaces/application/shell.mojom.h" 14 #include "mojo/public/interfaces/application/shell.mojom.h"
15 #include "mojo/shell/external_application_registrar.mojom.h" 15 #include "mojo/shell/external_application_registrar.mojom.h"
16 #include "net/base/net_errors.h" 16 #include "net/base/net_errors.h"
17 #include "net/socket/socket_descriptor.h" 17 #include "net/socket/socket_descriptor.h"
18 #include "net/socket/unix_domain_client_socket_posix.h" 18 #include "net/socket/unix_domain_client_socket_posix.h"
19 #include "url/gurl.h" 19 #include "url/gurl.h"
20 20
21 namespace mojo { 21 namespace mojo {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 base::MessageLoopProxy::current()); 74 base::MessageLoopProxy::current());
75 CHECK(ptr_message_pipe_handle.is_valid()); 75 CHECK(ptr_message_pipe_handle.is_valid());
76 client_socket_.reset(); // This is dead now, ensure it can't be reused. 76 client_socket_.reset(); // This is dead now, ensure it can't be reused.
77 77
78 registrar_.Bind(ptr_message_pipe_handle.Pass()); 78 registrar_.Bind(ptr_message_pipe_handle.Pass());
79 callback.Run(rv); 79 callback.Run(rv);
80 } 80 }
81 81
82 } // namespace shell 82 } // namespace shell
83 } // namespace mojo 83 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/external_application_registrar_connection.h ('k') | mojo/shell/external_application_test_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698