blimp/net/client_connection_manager.cc - Issue 1876983002: Use Chromium BUILD to approximate Blimp protocol version, and check it.

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: blimp/net/client_connection_manager.cc

Issue 1876983002: Use Chromium BUILD to approximate Blimp protocol version, and check it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Route EndConnection to OnConnectionError notifications Created 4 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

Index: blimp/net/client_connection_manager.cc

diff --git a/blimp/net/client_connection_manager.cc b/blimp/net/client_connection_manager.cc

index 19fd733d7d89baae2b367858f20677c3b0584739..3511cbef8ad33fea4db4999196a7eed6b94fdc91 100644

--- a/blimp/net/client_connection_manager.cc

+++ b/blimp/net/client_connection_manager.cc

@@ -7,7 +7,7 @@

#include "base/logging.h"

#include "blimp/common/create_blimp_message.h"

#include "blimp/common/proto/blimp_message.pb.h"

-#include "blimp/common/protocol_version.h"

+#include "blimp/common/version_info.h"

#include "blimp/net/blimp_connection.h"

#include "blimp/net/blimp_message_processor.h"

#include "blimp/net/blimp_transport.h"

@@ -68,7 +68,7 @@ void ClientConnectionManager::SendAuthenticationMessage(

std::unique_ptr<BlimpConnection> connection) {

DVLOG(1) << "Sending authentication message.";

connection->GetOutgoingMessageProcessor()->ProcessMessage(

- CreateStartConnectionMessage(client_token_, kProtocolVersion),

+ CreateStartConnectionMessage(client_token_, GetProtocolVersion()),

base::Bind(&ClientConnectionManager::OnAuthenticationMessageSent,

weak_factory_.GetWeakPtr(),

base::Passed(std::move(connection))));

« blimp/net/blimp_connection_unittest.cc ('K') | « blimp/net/blimp_connection_unittest.cc ('k') | blimp/net/client_connection_manager_unittest.cc » ('j') | no next file with comments »