| OLD | NEW |
| 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" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 } | 50 } |
| 51 DVLOG(1) << "Waiting for connection."; | 51 DVLOG(1) << "Waiting for connection."; |
| 52 } | 52 } |
| 53 | 53 |
| 54 void ExternalApplicationRegistrarConnection::Register( | 54 void ExternalApplicationRegistrarConnection::Register( |
| 55 const GURL& app_url, | 55 const GURL& app_url, |
| 56 ShellPtr* shell, | 56 ShellPtr* shell, |
| 57 base::Closure register_complete_callback) { | 57 base::Closure register_complete_callback) { |
| 58 DCHECK(!client_socket_); | 58 DCHECK(!client_socket_); |
| 59 registrar_->Register( | 59 registrar_->Register( |
| 60 String::From(app_url), Get(shell), register_complete_callback); | 60 String::From(app_url), GetProxy(shell), register_complete_callback); |
| 61 } | 61 } |
| 62 | 62 |
| 63 void ExternalApplicationRegistrarConnection::OnConnect( | 63 void ExternalApplicationRegistrarConnection::OnConnect( |
| 64 net::CompletionCallback callback, | 64 net::CompletionCallback callback, |
| 65 int rv) { | 65 int rv) { |
| 66 DVLOG(1) << "OnConnect called: " << net::ErrorToString(rv); | 66 DVLOG(1) << "OnConnect called: " << net::ErrorToString(rv); |
| 67 if (rv != net::OK) { | 67 if (rv != net::OK) { |
| 68 callback.Run(rv); | 68 callback.Run(rv); |
| 69 return; | 69 return; |
| 70 } | 70 } |
| 71 | 71 |
| 72 mojo::ScopedMessagePipeHandle ptr_message_pipe_handle = | 72 mojo::ScopedMessagePipeHandle ptr_message_pipe_handle = |
| 73 channel_init_.Init(client_socket_->ReleaseConnectedSocket(), | 73 channel_init_.Init(client_socket_->ReleaseConnectedSocket(), |
| 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 |
| OLD | NEW |