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

Side by Side Diff: remoting/client/plugin/chromoting_instance.cc

Issue 8493020: Move code in src/remoting to the new callbacks. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: - Created 9 years, 1 month 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
« no previous file with comments | « remoting/client/input_handler.h ('k') | remoting/client/plugin/pepper_input_handler.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/plugin/chromoting_instance.h" 5 #include "remoting/client/plugin/chromoting_instance.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 129
130 host_connection_.reset(new protocol::ConnectionToHost( 130 host_connection_.reset(new protocol::ConnectionToHost(
131 context_.network_message_loop(), this, true)); 131 context_.network_message_loop(), this, true));
132 132
133 input_handler_.reset(new PepperInputHandler(&context_, 133 input_handler_.reset(new PepperInputHandler(&context_,
134 host_connection_.get(), 134 host_connection_.get(),
135 view_proxy_)); 135 view_proxy_));
136 136
137 client_.reset(new ChromotingClient(config, &context_, host_connection_.get(), 137 client_.reset(new ChromotingClient(config, &context_, host_connection_.get(),
138 view_proxy_, rectangle_decoder_.get(), 138 view_proxy_, rectangle_decoder_.get(),
139 input_handler_.get(), NULL)); 139 input_handler_.get(), base::Closure()));
140 140
141 LOG(INFO) << "Connecting to " << config.host_jid 141 LOG(INFO) << "Connecting to " << config.host_jid
142 << ". Local jid: " << config.local_jid << "."; 142 << ". Local jid: " << config.local_jid << ".";
143 143
144 // Setup the XMPP Proxy. 144 // Setup the XMPP Proxy.
145 ChromotingScriptableObject* scriptable_object = GetScriptableObject(); 145 ChromotingScriptableObject* scriptable_object = GetScriptableObject();
146 scoped_refptr<PepperXmppProxy> xmpp_proxy = 146 scoped_refptr<PepperXmppProxy> xmpp_proxy =
147 new PepperXmppProxy(scriptable_object->AsWeakPtr(), 147 new PepperXmppProxy(scriptable_object->AsWeakPtr(),
148 plugin_message_loop_, 148 plugin_message_loop_,
149 context_.network_message_loop()); 149 context_.network_message_loop());
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 401
402 void ChromotingInstance::ReleaseAllKeys() { 402 void ChromotingInstance::ReleaseAllKeys() {
403 if (!input_handler_.get()) { 403 if (!input_handler_.get()) {
404 return; 404 return;
405 } 405 }
406 406
407 input_handler_->ReleaseAllKeys(); 407 input_handler_->ReleaseAllKeys();
408 } 408 }
409 409
410 } // namespace remoting 410 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/input_handler.h ('k') | remoting/client/plugin/pepper_input_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698