Fix Ctrl+Alt+Esc keyboard shortcut in Me2Me host.

remoting/host/chromoting_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/chromoting_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
@@ skipping 321 matching lines @@
 
   // Create a client object.
   scoped_ptr<protocol::ConnectionToClient> connection(
       new protocol::ConnectionToClient(session));
   ClientSession* client = new ClientSession(
       this, connection.Pass(), desktop_environment_->event_executor(),
       desktop_environment_->capturer());
   clients_.push_back(client);
 }
 
-void ChromotingHost::set_protocol_config(
-    protocol::CandidateSessionConfig* config) {
-  DCHECK(context_->network_message_loop()->BelongsToCurrentThread());
-  DCHECK(config);
-  DCHECK_EQ(state_, kInitial);
-  protocol_config_.reset(config);
-}

[Jamie, 2012/05/25 21:19:24]

Did these functions need to be re-ordered? AFACT, set_protocol_config hasn't
changed, but that would be a lot more obvious if it was still in the same place.

[Sergey Ulanov, 2012/05/25 21:59:30]

I reordered them so that they are in the same order as in the header. Returned
it back, will reorder in a separate CL.

-
-void ChromotingHost::LocalMouseMoved(const SkIPoint& new_pos) {
+void ChromotingHost::OnMouseMoved(const SkIPoint& new_pos) {
   if (!context_->network_message_loop()->BelongsToCurrentThread()) {
     context_->network_message_loop()->PostTask(
-        FROM_HERE, base::Bind(&ChromotingHost::LocalMouseMoved, this, new_pos));
+        FROM_HERE, base::Bind(&ChromotingHost::OnMouseMoved, this, new_pos));
     return;
   }
 
   ClientList::iterator client;
   for (client = clients_.begin(); client != clients_.end(); ++client) {
     (*client)->LocalMouseMoved(new_pos);
   }
 }
 
+void ChromotingHost::set_protocol_config(
+    protocol::CandidateSessionConfig* config) {
+  DCHECK(context_->network_message_loop()->BelongsToCurrentThread());
+  DCHECK(config);
+  DCHECK_EQ(state_, kInitial);
+  protocol_config_.reset(config);
+}
+
 void ChromotingHost::PauseSession(bool pause) {
   if (!context_->network_message_loop()->BelongsToCurrentThread()) {
     context_->network_message_loop()->PostTask(
         FROM_HERE, base::Bind(&ChromotingHost::PauseSession, this, pause));
     return;
   }
 
   ClientList::iterator client;
   for (client = clients_.begin(); client != clients_.end(); ++client) {
     (*client)->SetDisableInputs(pause);
@@ skipping 62 matching lines @@
                     OnShutdown());
 
   for (std::vector<base::Closure>::iterator it = shutdown_tasks_.begin();
        it != shutdown_tasks_.end(); ++it) {
     it->Run();
   }
   shutdown_tasks_.clear();
 }
 
 }  // namespace remoting