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

Unified Diff: remoting/host/chromoting_host.cc

Issue 10447041: Fix Ctrl+Alt+Esc keyboard shortcut in Me2Me host. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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: remoting/host/chromoting_host.cc
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index 5071400a21c19b04a0fb0e90d9cc36241f9ea0b6..b925e36157b026f4045949c395b49e335be4b78e 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -339,18 +339,10 @@ void ChromotingHost::OnIncomingSession(
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,
Sergey Ulanov 2012/05/25 21:59:30 I reordered them so that they are in the same orde
-
-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;
}
@@ -360,6 +352,14 @@ void ChromotingHost::LocalMouseMoved(const SkIPoint& 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(

Powered by Google App Engine
This is Rietveld 408576698