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

Unified Diff: shell/external_application_listener_posix.cc

Issue 775343004: Move //mojo/shell to //shell (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « shell/external_application_listener_posix.h ('k') | shell/external_application_listener_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/external_application_listener_posix.cc
diff --git a/mojo/shell/external_application_listener_posix.cc b/shell/external_application_listener_posix.cc
similarity index 87%
rename from mojo/shell/external_application_listener_posix.cc
rename to shell/external_application_listener_posix.cc
index d8ed8918dbe381fc66276ce32833a2cdaa4af759..adc6725120d7298146ba19a1f23196c0ed2b6ddc 100644
--- a/mojo/shell/external_application_listener_posix.cc
+++ b/shell/external_application_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/external_application_listener_posix.h"
+#include "shell/external_application_listener_posix.h"
#include "base/callback.h"
#include "base/files/file_path.h"
@@ -18,10 +18,10 @@
#include "mojo/common/common_type_converters.h"
#include "mojo/edk/embedder/channel_init.h"
#include "mojo/public/cpp/bindings/error_handler.h"
-#include "mojo/shell/domain_socket/net_errors.h"
-#include "mojo/shell/domain_socket/socket_descriptor.h"
-#include "mojo/shell/external_application_registrar.mojom.h"
-#include "mojo/shell/incoming_connection_listener_posix.h"
+#include "shell/domain_socket/net_errors.h"
+#include "shell/domain_socket/socket_descriptor.h"
+#include "shell/external_application_registrar.mojom.h"
+#include "shell/incoming_connection_listener_posix.h"
#include "url/gurl.h"
namespace mojo {
@@ -82,10 +82,8 @@ ExternalApplicationListenerPosix::~ExternalApplicationListenerPosix() {
// this object does, as it holds a pointer back to this instance.
base::WaitableEvent stop_listening_event(true, false);
io_runner_->PostTask(
- FROM_HERE,
- base::Bind(&ExternalApplicationListenerPosix::StopListening,
- base::Unretained(this),
- &stop_listening_event));
+ FROM_HERE, base::Bind(&ExternalApplicationListenerPosix::StopListening,
+ base::Unretained(this), &stop_listening_event));
stop_listening_event.Wait();
}
@@ -93,8 +91,8 @@ void ExternalApplicationListenerPosix::ListenInBackground(
const base::FilePath& listen_socket_path,
const RegisterCallback& register_callback) {
DCHECK(register_thread_checker_.CalledOnValidThread());
- ListenInBackgroundWithErrorCallback(
- listen_socket_path, register_callback, ErrorCallback());
+ ListenInBackgroundWithErrorCallback(listen_socket_path, register_callback,
+ ErrorCallback());
}
void ExternalApplicationListenerPosix::ListenInBackgroundWithErrorCallback(
@@ -106,10 +104,8 @@ void ExternalApplicationListenerPosix::ListenInBackgroundWithErrorCallback(
error_callback_ = error_callback;
io_runner_->PostTask(
- FROM_HERE,
- base::Bind(&ExternalApplicationListenerPosix::StartListening,
- base::Unretained(this),
- listen_socket_path));
+ FROM_HERE, base::Bind(&ExternalApplicationListenerPosix::StartListening,
+ base::Unretained(this), listen_socket_path));
}
void ExternalApplicationListenerPosix::WaitForListening() {
@@ -140,8 +136,7 @@ void ExternalApplicationListenerPosix::OnListening(int rv) {
FROM_HERE,
base::Bind(
&ExternalApplicationListenerPosix::RunErrorCallbackIfListeningFailed,
- weak_ptr_factory_.GetWeakPtr(),
- rv));
+ weak_ptr_factory_.GetWeakPtr(), rv));
}
void ExternalApplicationListenerPosix::OnConnection(SocketDescriptor incoming) {
@@ -150,8 +145,7 @@ void ExternalApplicationListenerPosix::OnConnection(SocketDescriptor incoming) {
FROM_HERE,
base::Bind(
&ExternalApplicationListenerPosix::CreatePipeAndBindToRegistrarImpl,
- weak_ptr_factory_.GetWeakPtr(),
- incoming));
+ weak_ptr_factory_.GetWeakPtr(), incoming));
}
void ExternalApplicationListenerPosix::RunErrorCallbackIfListeningFailed(
« no previous file with comments | « shell/external_application_listener_posix.h ('k') | shell/external_application_listener_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698