Index: shell/external_application_registrar_connection.cc |
diff --git a/mojo/shell/external_application_registrar_connection.cc b/shell/external_application_registrar_connection.cc |
similarity index 86% |
rename from mojo/shell/external_application_registrar_connection.cc |
rename to shell/external_application_registrar_connection.cc |
index 59519364b9117dc6252320001df5df587aca744d..2abcccc9b0ad70e4907204528a049bcf4ac432f6 100644 |
--- a/mojo/shell/external_application_registrar_connection.cc |
+++ b/shell/external_application_registrar_connection.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/external_application_registrar_connection.h" |
+#include "shell/external_application_registrar_connection.h" |
#include "base/bind.h" |
#include "base/files/file_path.h" |
@@ -12,10 +12,10 @@ |
#include "mojo/public/cpp/bindings/error_handler.h" |
#include "mojo/public/interfaces/application/application.mojom.h" |
#include "mojo/public/interfaces/application/shell.mojom.h" |
-#include "mojo/shell/domain_socket/net_errors.h" |
-#include "mojo/shell/domain_socket/socket_descriptor.h" |
-#include "mojo/shell/domain_socket/unix_domain_client_socket_posix.h" |
-#include "mojo/shell/external_application_registrar.mojom.h" |
+#include "shell/domain_socket/net_errors.h" |
+#include "shell/domain_socket/socket_descriptor.h" |
+#include "shell/domain_socket/unix_domain_client_socket_posix.h" |
+#include "shell/external_application_registrar.mojom.h" |
#include "url/gurl.h" |
namespace mojo { |
@@ -40,8 +40,7 @@ void ExternalApplicationRegistrarConnection::Connect( |
DCHECK(client_socket_) << "Single use only."; |
int rv = client_socket_->Connect( |
base::Bind(&ExternalApplicationRegistrarConnection::OnConnect, |
- base::Unretained(this), |
- callback)); |
+ base::Unretained(this), callback)); |
if (rv != net::ERR_IO_PENDING) { |
DVLOG(1) << "Connect returning immediately: " << net::ErrorToString(rv); |
OnConnect(callback, rv); |