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

Unified Diff: remoting/protocol/jingle_session.cc

Issue 205583011: [Draft] Fix canceling pin prompt causes host overload (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removing .gitIngore Created 6 years, 9 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: remoting/protocol/jingle_session.cc
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index 2aecd4c25d6856d86a4f8f0ab1645219edad48a1..2ad682a5b34439e43e6f8439cfaf746b57421119 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -181,6 +181,9 @@ void JingleSession::ContinueAcceptIncomingConnection() {
SetState(AUTHENTICATED);
} else {
DCHECK_EQ(authenticator_->state(), Authenticator::WAITING_MESSAGE);
+ if (authenticator_->has_auth_started()) {
+ event_handler_->OnSessionAuthenticationBegin();
+ }
}
return;
@@ -495,7 +498,6 @@ void JingleSession::OnSessionInfo(const JingleMessage& message,
}
reply_callback.Run(JingleMessageReply::NONE);
-
Sergey Ulanov 2014/03/24 18:42:36 nit: keep this empty line
kelvinp 2014/03/24 23:11:39 Done.
authenticator_->ProcessMessage(message.info.get(), base::Bind(
&JingleSession::ProcessAuthenticationStep, base::Unretained(this)));
}
@@ -584,6 +586,10 @@ void JingleSession::ProcessAuthenticationStep() {
return;
}
+ if (authenticator_->has_auth_started()) {
+ event_handler_->OnSessionAuthenticationBegin();
+ }
+
if (authenticator_->state() == Authenticator::MESSAGE_READY) {
JingleMessage message(peer_jid_, JingleMessage::SESSION_INFO, session_id_);
message.info = authenticator_->GetNextMessage();
@@ -648,7 +654,6 @@ void JingleSession::SetState(State new_state) {
if (new_state != state_) {
DCHECK_NE(state_, CLOSED);
DCHECK_NE(state_, FAILED);
-
Sergey Ulanov 2014/03/24 18:42:36 nit: keep this line
kelvinp 2014/03/24 23:11:39 Done.
state_ = new_state;
if (event_handler_)
event_handler_->OnSessionStateChange(new_state);

Powered by Google App Engine
This is Rietveld 408576698