Commit e386dad6 authored by Joe Downing's avatar Joe Downing Committed by Commit Bot

Fixing some typos

I originally fixed these as part of a different CL but that change
turned out to be unnecessary due to my change last week to cleanly close
the PeerConnection.  So here is a super-minor clean-up CL that fixes
some comments.

Change-Id: I588239e74f341d87a2468d7d47eccb00161fb5b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2208091
Commit-Queue: Joe Downing <joedow@chromium.org>
Auto-Submit: Joe Downing <joedow@chromium.org>
Reviewed-by: default avatarJamie Walch <jamiewalch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#769970}
parent 7ee1495f
...@@ -44,11 +44,11 @@ class DesktopEnvironmentFactory; ...@@ -44,11 +44,11 @@ class DesktopEnvironmentFactory;
// Here's the work flow of this class: // Here's the work flow of this class:
// 1. We should load the saved GAIA ID token or if this is the first // 1. We should load the saved GAIA ID token or if this is the first
// time the host process runs we should prompt user for the // time the host process runs we should prompt user for the
// credential. We will use this token or credentials to authenicate // credential. We will use this token or credentials to authenticate
// and register the host. // and register the host.
// //
// 2. We listen for incoming connection using libjingle. We will create // 2. We listen for an incoming connection using libjingle. We will create
// a ConnectionToClient object that wraps around linjingle for transport. // a ConnectionToClient object that wraps around libjingle for transport.
// A VideoFramePump is created with an Encoder and a webrtc::DesktopCapturer. // A VideoFramePump is created with an Encoder and a webrtc::DesktopCapturer.
// A ConnectionToClient is added to the ScreenRecorder for transporting // A ConnectionToClient is added to the ScreenRecorder for transporting
// the screen captures. An InputStub is created and registered with the // the screen captures. An InputStub is created and registered with the
...@@ -59,8 +59,8 @@ class DesktopEnvironmentFactory; ...@@ -59,8 +59,8 @@ class DesktopEnvironmentFactory;
// //
// 3. When the user is disconnected, we will pause the ScreenRecorder // 3. When the user is disconnected, we will pause the ScreenRecorder
// and try to terminate the threads we have created. This will allow // and try to terminate the threads we have created. This will allow
// all pending tasks to complete. After all of that completed we // all pending tasks to complete. After all of that has completed, we
// return to the idle state. We then go to step (2) if there a new // return to the idle state. We then go to step (2) to wait for a new
// incoming connection. // incoming connection.
class ChromotingHost : public ClientSession::EventHandler { class ChromotingHost : public ClientSession::EventHandler {
public: public:
...@@ -78,8 +78,7 @@ class ChromotingHost : public ClientSession::EventHandler { ...@@ -78,8 +78,7 @@ class ChromotingHost : public ClientSession::EventHandler {
// Asynchronously starts the host. // Asynchronously starts the host.
// //
// After this is invoked, the host process will connect to the talk // Once this is called, the host will start listening for inbound connections.
// network and start listening for incoming connections.
// //
// This method can only be called once during the lifetime of this object. // This method can only be called once during the lifetime of this object.
void Start(const std::string& host_owner); void Start(const std::string& host_owner);
...@@ -140,7 +139,7 @@ class ChromotingHost : public ClientSession::EventHandler { ...@@ -140,7 +139,7 @@ class ChromotingHost : public ClientSession::EventHandler {
private: private:
friend class ChromotingHostTest; friend class ChromotingHostTest;
// Unless specified otherwise all members of this class must be // Unless specified otherwise, all members of this class must be
// used on the network thread only. // used on the network thread only.
// Parameters specified when the host was created. // Parameters specified when the host was created.
......
...@@ -245,8 +245,8 @@ void It2MeHost::OnAccessDenied(const std::string& jid) { ...@@ -245,8 +245,8 @@ void It2MeHost::OnAccessDenied(const std::string& jid) {
void It2MeHost::OnClientConnected(const std::string& jid) { void It2MeHost::OnClientConnected(const std::string& jid) {
DCHECK(host_context_->network_task_runner()->BelongsToCurrentThread()); DCHECK(host_context_->network_task_runner()->BelongsToCurrentThread());
// ChromotingHost doesn't allow multiple concurrent connection and the // ChromotingHost doesn't allow concurrent connections and the host is
// host is destroyed in OnClientDisconnected() after the first connection. // destroyed in OnClientDisconnected() after the first connection.
CHECK_NE(state_, kConnected); CHECK_NE(state_, kConnected);
std::string client_username; std::string client_username;
...@@ -358,7 +358,7 @@ void It2MeHost::UpdateClientDomainListPolicy( ...@@ -358,7 +358,7 @@ void It2MeHost::UpdateClientDomainListPolicy(
VLOG(2) << "UpdateClientDomainPolicy: " VLOG(2) << "UpdateClientDomainPolicy: "
<< base::JoinString(client_domain_list, ", "); << base::JoinString(client_domain_list, ", ");
// When setting a client domain policy, disconnect any existing session. // When setting a client domain policy, disconnect any existing session.
if (!client_domain_list.empty() && IsRunning()) { if (!client_domain_list.empty() && IsRunning()) {
DisconnectOnNetworkThread(); DisconnectOnNetworkThread();
} }
...@@ -478,7 +478,7 @@ void It2MeHost::OnReceivedSupportID(const std::string& support_id, ...@@ -478,7 +478,7 @@ void It2MeHost::OnReceivedSupportID(const std::string& support_id,
void It2MeHost::DisconnectOnNetworkThread() { void It2MeHost::DisconnectOnNetworkThread() {
DCHECK(host_context_->network_task_runner()->BelongsToCurrentThread()); DCHECK(host_context_->network_task_runner()->BelongsToCurrentThread());
// Disconnect() may be called even when after the host been already stopped. // Disconnect() may be called even after the host has already been stopped.
// Ignore repeated calls. // Ignore repeated calls.
if (state_ == kDisconnected) { if (state_ == kDisconnected) {
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment