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

Unified Diff: mojo/system/channel.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/channel.h ('k') | mojo/system/multiprocess_message_pipe_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/channel.cc
diff --git a/mojo/system/channel.cc b/mojo/system/channel.cc
index 1160d738abc9063439e5837548e76501ace0b6e2..8c2c6b760e24935d5482b61d7e4d61f19f6abed5 100644
--- a/mojo/system/channel.cc
+++ b/mojo/system/channel.cc
@@ -37,7 +37,7 @@ Channel::Channel()
: next_local_id_(kBootstrapEndpointId) {
}
-bool Channel::Init(const PlatformChannelHandle& handle) {
+bool Channel::Init(ScopedPlatformHandle handle) {
DCHECK(creation_thread_checker_.CalledOnValidThread());
// No need to take |lock_|, since this must be called before this object
@@ -45,7 +45,7 @@ bool Channel::Init(const PlatformChannelHandle& handle) {
DCHECK(!raw_channel_.get());
raw_channel_.reset(
- RawChannel::Create(handle, this, base::MessageLoop::current()));
+ RawChannel::Create(handle.Pass(), this, base::MessageLoop::current()));
if (!raw_channel_->Init()) {
raw_channel_.reset();
return false;
@@ -110,7 +110,7 @@ bool Channel::WriteMessage(MessageInTransit* message) {
if (!raw_channel_.get()) {
// TODO(vtl): I think this is probably not an error condition, but I should
// think about it (and the shutdown sequence) more carefully.
- LOG(INFO) << "WriteMessage() after shutdown";
+ LOG(WARNING) << "WriteMessage() after shutdown";
return false;
}
@@ -203,7 +203,7 @@ void Channel::OnReadMessageForChannel(const MessageInTransit& message) {
void Channel::HandleRemoteError(const base::StringPiece& error_message) {
// TODO(vtl): Is this how we really want to handle this?
- LOG(INFO) << error_message;
+ LOG(WARNING) << error_message;
}
void Channel::HandleLocalError(const base::StringPiece& error_message) {
« no previous file with comments | « mojo/system/channel.h ('k') | mojo/system/multiprocess_message_pipe_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698