Index: remoting/client/plugin/pepper_view.cc |
diff --git a/remoting/client/plugin/pepper_view.cc b/remoting/client/plugin/pepper_view.cc |
index c893d0bd6d95289e92a5ce3f35ba3527438fdb82..fa20c06a64b86c29e62544f04b7a8ade5bd9f615 100644 |
--- a/remoting/client/plugin/pepper_view.cc |
+++ b/remoting/client/plugin/pepper_view.cc |
@@ -237,11 +237,13 @@ void PepperView::SetConnectionState(protocol::ConnectionToHost::State state, |
break; |
case protocol::ConnectionToHost::CONNECTED: |
- scriptable_obj->SignalLoginChallenge(); |
break; |
case protocol::ConnectionToHost::AUTHENTICATED: |
UnsetSolidFill(); |
+ scriptable_obj->SetConnectionStatus( |
+ ChromotingScriptableObject::STATUS_CONNECTED, |
+ ConvertConnectionError(error)); |
break; |
case protocol::ConnectionToHost::CLOSED: |
@@ -260,20 +262,6 @@ void PepperView::SetConnectionState(protocol::ConnectionToHost::State state, |
} |
} |
-void PepperView::UpdateLoginStatus(bool success, const std::string& info) { |
- DCHECK(context_->main_message_loop()->BelongsToCurrentThread()); |
- |
- // TODO(hclam): Re-consider the way we communicate with Javascript. |
- ChromotingScriptableObject* scriptable_obj = instance_->GetScriptableObject(); |
- if (success) { |
- scriptable_obj->SetConnectionStatus( |
- ChromotingScriptableObject::STATUS_CONNECTED, |
- ChromotingScriptableObject::ERROR_NONE); |
- } else { |
- scriptable_obj->SignalLoginChallenge(); |
- } |
-} |
- |
bool PepperView::SetPluginSize(const SkISize& plugin_size) { |
if (plugin_size_ == plugin_size) |
return false; |