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

Unified Diff: apps/app_shim/unix_domain_socket_acceptor.cc

Issue 585123004: Mac: Give app_shim code a nicer home (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: various cleanups Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apps/app_shim/unix_domain_socket_acceptor.h ('k') | chrome/app/app_mode-Info.plist » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/app_shim/unix_domain_socket_acceptor.cc
diff --git a/apps/app_shim/unix_domain_socket_acceptor.cc b/apps/app_shim/unix_domain_socket_acceptor.cc
deleted file mode 100644
index f5cda65159a8a0e4b06f5c924ce0d330a0786cc6..0000000000000000000000000000000000000000
--- a/apps/app_shim/unix_domain_socket_acceptor.cc
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "apps/app_shim/unix_domain_socket_acceptor.h"
-
-#include "base/files/file_util.h"
-#include "base/files/scoped_file.h"
-#include "base/logging.h"
-#include "ipc/unix_domain_socket_util.h"
-
-namespace apps {
-
-UnixDomainSocketAcceptor::UnixDomainSocketAcceptor(const base::FilePath& path,
- Delegate* delegate)
- : path_(path), delegate_(delegate), listen_fd_(-1) {
- DCHECK(delegate_);
- CreateSocket();
-}
-
-UnixDomainSocketAcceptor::~UnixDomainSocketAcceptor() {
- Close();
-}
-
-bool UnixDomainSocketAcceptor::CreateSocket() {
- DCHECK(listen_fd_ < 0);
-
- // Create the socket.
- return IPC::CreateServerUnixDomainSocket(path_, &listen_fd_);
-}
-
-bool UnixDomainSocketAcceptor::Listen() {
- if (listen_fd_ < 0)
- return false;
-
- // Watch the fd for connections, and turn any connections into
- // active sockets.
- base::MessageLoopForIO::current()->WatchFileDescriptor(
- listen_fd_,
- true,
- base::MessageLoopForIO::WATCH_READ,
- &server_listen_connection_watcher_,
- this);
- return true;
-}
-
-// Called by libevent when we can read from the fd without blocking.
-void UnixDomainSocketAcceptor::OnFileCanReadWithoutBlocking(int fd) {
- DCHECK(fd == listen_fd_);
- int new_fd = -1;
- if (!IPC::ServerAcceptConnection(listen_fd_, &new_fd)) {
- Close();
- delegate_->OnListenError();
- return;
- }
- base::ScopedFD scoped_fd(new_fd);
-
- if (!scoped_fd.is_valid()) {
- // The accept() failed, but not in such a way that the factory needs to be
- // shut down.
- return;
- }
-
- // Verify that the IPC channel peer is running as the same user.
- if (!IPC::IsPeerAuthorized(scoped_fd.get()))
- return;
-
- IPC::ChannelHandle handle(std::string(),
- base::FileDescriptor(scoped_fd.release(), true));
- delegate_->OnClientConnected(handle);
-}
-
-void UnixDomainSocketAcceptor::OnFileCanWriteWithoutBlocking(int fd) {
- NOTREACHED() << "Listen fd should never be writable.";
-}
-
-void UnixDomainSocketAcceptor::Close() {
- if (listen_fd_ < 0)
- return;
- if (IGNORE_EINTR(close(listen_fd_)) < 0)
- PLOG(ERROR) << "close";
- listen_fd_ = -1;
- if (unlink(path_.value().c_str()) < 0)
- PLOG(ERROR) << "unlink";
-
- // Unregister libevent for the listening socket and close it.
- server_listen_connection_watcher_.StopWatchingFileDescriptor();
-}
-
-} // namespace apps
« no previous file with comments | « apps/app_shim/unix_domain_socket_acceptor.h ('k') | chrome/app/app_mode-Info.plist » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698