Index: shell/incoming_connection_listener_posix.cc |
diff --git a/mojo/shell/incoming_connection_listener_posix.cc b/shell/incoming_connection_listener_posix.cc |
similarity index 89% |
rename from mojo/shell/incoming_connection_listener_posix.cc |
rename to shell/incoming_connection_listener_posix.cc |
index cf70d0db1d5069ac371a45d8ad1f9d2deb053297..cf9dfb3e4dbdc2c5c285aef5724852d150c92f45 100644 |
--- a/mojo/shell/incoming_connection_listener_posix.cc |
+++ b/shell/incoming_connection_listener_posix.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "mojo/shell/incoming_connection_listener_posix.h" |
+#include "shell/incoming_connection_listener_posix.h" |
#include "base/callback.h" |
#include "base/files/file_path.h" |
@@ -11,9 +11,9 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/sequenced_task_runner.h" |
#include "base/tracked_objects.h" |
-#include "mojo/shell/domain_socket/net_errors.h" |
-#include "mojo/shell/domain_socket/socket_descriptor.h" |
-#include "mojo/shell/domain_socket/unix_domain_server_socket_posix.h" |
+#include "shell/domain_socket/net_errors.h" |
+#include "shell/domain_socket/socket_descriptor.h" |
+#include "shell/domain_socket/unix_domain_server_socket_posix.h" |
namespace mojo { |
namespace shell { |
@@ -71,9 +71,8 @@ void IncomingConnectionListenerPosix::StartListening() { |
void IncomingConnectionListenerPosix::Accept() { |
DCHECK(listen_thread_checker_.CalledOnValidThread()); |
int rv = listen_socket_.Accept( |
- &incoming_socket_, |
- base::Bind(&IncomingConnectionListenerPosix::OnAccept, |
- weak_ptr_factory_.GetWeakPtr())); |
+ &incoming_socket_, base::Bind(&IncomingConnectionListenerPosix::OnAccept, |
+ weak_ptr_factory_.GetWeakPtr())); |
// If rv == net::ERR_IO_PENDING), listen_socket_ will call |
// OnAccept() later, when a connection attempt comes in. |