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

Side by Side Diff: remoting/client/jni/chromoting_jni_instance.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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/jni/chromoting_jni_instance.h" 5 #include "remoting/client/jni/chromoting_jni_instance.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "remoting/client/audio_player.h" 9 #include "remoting/client/audio_player.h"
10 #include "remoting/client/jni/android_keymap.h" 10 #include "remoting/client/jni/android_keymap.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 169
170 jni_runtime_->ui_task_runner()->PostTask( 170 jni_runtime_->ui_task_runner()->PostTask(
171 FROM_HERE, 171 FROM_HERE,
172 base::Bind(&ChromotingJniRuntime::CommitPairingCredentials, 172 base::Bind(&ChromotingJniRuntime::CommitPairingCredentials,
173 base::Unretained(jni_runtime_), 173 base::Unretained(jni_runtime_),
174 host_id_, 174 host_id_,
175 response.client_id(), 175 response.client_id(),
176 response.shared_secret())); 176 response.shared_secret()));
177 } 177 }
178 178
179 void ChromotingJniInstance::DeliverHostMessage(
180 const protocol::ExtensionMessage& message) {
181 NOTIMPLEMENTED();
182 }
183
179 protocol::ClipboardStub* ChromotingJniInstance::GetClipboardStub() { 184 protocol::ClipboardStub* ChromotingJniInstance::GetClipboardStub() {
180 return this; 185 return this;
181 } 186 }
182 187
183 protocol::CursorShapeStub* ChromotingJniInstance::GetCursorShapeStub() { 188 protocol::CursorShapeStub* ChromotingJniInstance::GetCursorShapeStub() {
184 return this; 189 return this;
185 } 190 }
186 191
187 scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher> 192 scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher>
188 ChromotingJniInstance::GetTokenFetcher(const std::string& host_public_key) { 193 ChromotingJniInstance::GetTokenFetcher(const std::string& host_public_key) {
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 // Unless we forget about the stale credentials, we'll continue trying them. 312 // Unless we forget about the stale credentials, we'll continue trying them.
308 LOG(INFO) << "Deleting rejected pairing credentials"; 313 LOG(INFO) << "Deleting rejected pairing credentials";
309 jni_runtime_->CommitPairingCredentials(host_id_, "", ""); 314 jni_runtime_->CommitPairingCredentials(host_id_, "", "");
310 } 315 }
311 316
312 pin_callback_ = callback; 317 pin_callback_ = callback;
313 jni_runtime_->DisplayAuthenticationPrompt(); 318 jni_runtime_->DisplayAuthenticationPrompt();
314 } 319 }
315 320
316 } // namespace remoting 321 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/jni/chromoting_jni_instance.h ('k') | remoting/client/plugin/chromoting_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698