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

Side by Side Diff: remoting/client/chromoting_client.cc

Issue 22477006: Added JsonMessage to the control channel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/client/chromoting_client.h ('k') | remoting/client/client_user_interface.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/client/chromoting_client.h" 5 #include "remoting/client/chromoting_client.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "remoting/base/capabilities.h" 8 #include "remoting/base/capabilities.h"
9 #include "remoting/client/audio_decode_scheduler.h" 9 #include "remoting/client/audio_decode_scheduler.h"
10 #include "remoting/client/audio_player.h" 10 #include "remoting/client/audio_player.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 IntersectCapabilities(config_.capabilities, host_capabilities_)); 112 IntersectCapabilities(config_.capabilities, host_capabilities_));
113 } 113 }
114 114
115 void ChromotingClient::SetPairingResponse( 115 void ChromotingClient::SetPairingResponse(
116 const protocol::PairingResponse& pairing_response) { 116 const protocol::PairingResponse& pairing_response) {
117 DCHECK(task_runner_->BelongsToCurrentThread()); 117 DCHECK(task_runner_->BelongsToCurrentThread());
118 118
119 user_interface_->SetPairingResponse(pairing_response); 119 user_interface_->SetPairingResponse(pairing_response);
120 } 120 }
121 121
122 void ChromotingClient::DeliverHostMessage(
123 const protocol::ExtensionMessage& message) {
124 DCHECK(task_runner_->BelongsToCurrentThread());
125
126 user_interface_->DeliverHostMessage(message);
127 }
128
122 void ChromotingClient::InjectClipboardEvent( 129 void ChromotingClient::InjectClipboardEvent(
123 const protocol::ClipboardEvent& event) { 130 const protocol::ClipboardEvent& event) {
124 DCHECK(task_runner_->BelongsToCurrentThread()); 131 DCHECK(task_runner_->BelongsToCurrentThread());
125 132
126 user_interface_->GetClipboardStub()->InjectClipboardEvent(event); 133 user_interface_->GetClipboardStub()->InjectClipboardEvent(event);
127 } 134 }
128 135
129 void ChromotingClient::SetCursorShape( 136 void ChromotingClient::SetCursorShape(
130 const protocol::CursorShapeInfo& cursor_shape) { 137 const protocol::CursorShapeInfo& cursor_shape) {
131 DCHECK(task_runner_->BelongsToCurrentThread()); 138 DCHECK(task_runner_->BelongsToCurrentThread());
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 if (connection_->config().SupportsCapabilities()) { 184 if (connection_->config().SupportsCapabilities()) {
178 VLOG(1) << "Client capabilities: " << config_.capabilities; 185 VLOG(1) << "Client capabilities: " << config_.capabilities;
179 186
180 protocol::Capabilities capabilities; 187 protocol::Capabilities capabilities;
181 capabilities.set_capabilities(config_.capabilities); 188 capabilities.set_capabilities(config_.capabilities);
182 connection_->host_stub()->SetCapabilities(capabilities); 189 connection_->host_stub()->SetCapabilities(capabilities);
183 } 190 }
184 } 191 }
185 192
186 } // namespace remoting 193 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/chromoting_client.h ('k') | remoting/client/client_user_interface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698