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

Unified Diff: mojo/system/platform_channel_pair.cc

Issue 137273003: Mojo: Rename PlatformChannelHandle to PlatformHandle, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 11 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 | « mojo/system/platform_channel_pair.h ('k') | mojo/system/platform_channel_pair_posix.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/platform_channel_pair.cc
diff --git a/mojo/system/platform_channel_pair.cc b/mojo/system/platform_channel_pair.cc
index cdf27a465426694349542cdb3f9787a65e90c543..f1cd594cf0d7bef76d526fe9f0c196476d6da3f5 100644
--- a/mojo/system/platform_channel_pair.cc
+++ b/mojo/system/platform_channel_pair.cc
@@ -5,38 +5,19 @@
#include "mojo/system/platform_channel_pair.h"
#include "base/logging.h"
-#include "mojo/system/platform_channel.h"
namespace mojo {
namespace system {
PlatformChannelPair::~PlatformChannelPair() {
- server_handle_.CloseIfNecessary();
- client_handle_.CloseIfNecessary();
}
-scoped_ptr<PlatformChannel> PlatformChannelPair::CreateServerChannel() {
- if (!server_handle_.is_valid()) {
- LOG(WARNING) << "Server handle invalid";
- return scoped_ptr<PlatformChannel>();
- }
-
- scoped_ptr<PlatformChannel> rv =
- PlatformChannel::CreateFromHandle(server_handle_);
- server_handle_ = PlatformChannelHandle();
- return rv.Pass();
+ScopedPlatformHandle PlatformChannelPair::PassServerHandle() {
+ return server_handle_.Pass();
}
-scoped_ptr<PlatformChannel> PlatformChannelPair::CreateClientChannel() {
- if (!client_handle_.is_valid()) {
- LOG(WARNING) << "Client handle invalid";
- return scoped_ptr<PlatformChannel>();
- }
-
- scoped_ptr<PlatformChannel> rv =
- PlatformChannel::CreateFromHandle(client_handle_);
- client_handle_ = PlatformChannelHandle();
- return rv.Pass();
+ScopedPlatformHandle PlatformChannelPair::PassClientHandle() {
+ return client_handle_.Pass();
}
} // namespace system
« no previous file with comments | « mojo/system/platform_channel_pair.h ('k') | mojo/system/platform_channel_pair_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698