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

Unified Diff: remoting/host/chromoting_host.cc

Issue 10873050: [Chromoting] Hook up host talkgadget policy checks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « no previous file | remoting/host/constants.h » ('j') | remoting/host/remoting_me2me_host.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/chromoting_host.cc
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index 1d209694ba71613cb8df338d8c0a37b077093172..a25c97213e0def746675d9489f3a504446a4ebeb 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "base/message_loop_proxy.h"
#include "build/build_config.h"
+#include "googleurl/src/gurl.h"
#include "remoting/base/constants.h"
#include "remoting/base/encoder.h"
#include "remoting/base/encoder_row_based.h"
@@ -310,6 +311,7 @@ void ChromotingHost::OnSessionRouteChange(
route));
}
+// SessionManager::Listener implementation.
void ChromotingHost::OnSessionManagerReady() {
DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
// Don't need to do anything here, just wait for incoming
@@ -364,14 +366,7 @@ void ChromotingHost::OnIncomingSession(
clients_.push_back(client);
}
-void ChromotingHost::set_protocol_config(
- protocol::CandidateSessionConfig* config) {
- DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
- DCHECK(config);
- DCHECK_EQ(state_, kInitial);
- protocol_config_.reset(config);
-}
-
+// MouseMoveObserver interface.
void ChromotingHost::OnLocalMouseMoved(const SkIPoint& new_pos) {
if (!context_->network_task_runner()->BelongsToCurrentThread()) {
context_->network_task_runner()->PostTask(
@@ -386,6 +381,14 @@ void ChromotingHost::OnLocalMouseMoved(const SkIPoint& new_pos) {
}
}
+void ChromotingHost::set_protocol_config(
+ protocol::CandidateSessionConfig* config) {
+ DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
+ DCHECK(config);
+ DCHECK_EQ(state_, kInitial);
+ protocol_config_.reset(config);
+}
+
void ChromotingHost::PauseSession(bool pause) {
if (!context_->network_task_runner()->BelongsToCurrentThread()) {
context_->network_task_runner()->PostTask(
« no previous file with comments | « no previous file | remoting/host/constants.h » ('j') | remoting/host/remoting_me2me_host.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698