third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc - Issue 1142043005: Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc

Issue 1142043005: Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix type conversion errors on win64 for some msvs Created 5 years, 7 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 | « third_party/mojo/src/mojo/edk/system/raw_channel.cc ('k') | third_party/mojo/src/mojo/edk/system/unique_identifier.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc

diff --git a/third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc b/third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc

index aad78a275dc35acf489fe65ea191acae37add3bd..dfe69d4f450c0d3b7f15820b9de26ea9fc8a835c 100644

--- a/third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc

+++ b/third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc

@@ -147,7 +147,8 @@ void SlaveConnectionManager::AllowConnectOnPrivateThread(

DCHECK(!lock_.Try());

DCHECK_EQ(awaiting_ack_type_, NOT_AWAITING_ACK);

- DVLOG(1) << "Sending AllowConnect: connection ID " << connection_id;

+ DVLOG(1) << "Sending AllowConnect: connection ID "

+ << connection_id.ToString();

if (!raw_channel_->WriteMessage(make_scoped_ptr(new MessageInTransit(

MessageInTransit::kTypeConnectionManager,

MessageInTransit::kSubtypeConnectionManagerAllowConnect,

@@ -171,7 +172,8 @@ void SlaveConnectionManager::CancelConnectOnPrivateThread(

DCHECK(!lock_.Try());

DCHECK_EQ(awaiting_ack_type_, NOT_AWAITING_ACK);

- DVLOG(1) << "Sending CancelConnect: connection ID " << connection_id;

+ DVLOG(1) << "Sending CancelConnect: connection ID "

+ << connection_id.ToString();

if (!raw_channel_->WriteMessage(make_scoped_ptr(new MessageInTransit(

MessageInTransit::kTypeConnectionManager,

MessageInTransit::kSubtypeConnectionManagerCancelConnect,

@@ -199,7 +201,7 @@ void SlaveConnectionManager::ConnectOnPrivateThread(

DCHECK(!lock_.Try());

DCHECK_EQ(awaiting_ack_type_, NOT_AWAITING_ACK);

- DVLOG(1) << "Sending Connect: connection ID " << connection_id;

+ DVLOG(1) << "Sending Connect: connection ID " << connection_id.ToString();

if (!raw_channel_->WriteMessage(make_scoped_ptr(new MessageInTransit(

MessageInTransit::kTypeConnectionManager,

MessageInTransit::kSubtypeConnectionManagerConnect,

« no previous file with comments | « third_party/mojo/src/mojo/edk/system/raw_channel.cc ('k') | third_party/mojo/src/mojo/edk/system/unique_identifier.h » ('j') | no next file with comments »