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

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

Issue 7218061: Close all writers before JingleSession is destroyed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 9 years, 5 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/input_handler.cc ('k') | remoting/protocol/buffered_socket_writer.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 20 matching lines...) Expand all
31 #include "remoting/client/plugin/pepper_client_logger.h" 31 #include "remoting/client/plugin/pepper_client_logger.h"
32 #include "remoting/client/plugin/pepper_input_handler.h" 32 #include "remoting/client/plugin/pepper_input_handler.h"
33 #include "remoting/client/plugin/pepper_port_allocator_session.h" 33 #include "remoting/client/plugin/pepper_port_allocator_session.h"
34 #include "remoting/client/plugin/pepper_view.h" 34 #include "remoting/client/plugin/pepper_view.h"
35 #include "remoting/client/plugin/pepper_view_proxy.h" 35 #include "remoting/client/plugin/pepper_view_proxy.h"
36 #include "remoting/client/plugin/pepper_util.h" 36 #include "remoting/client/plugin/pepper_util.h"
37 #include "remoting/client/plugin/pepper_xmpp_proxy.h" 37 #include "remoting/client/plugin/pepper_xmpp_proxy.h"
38 #include "remoting/jingle_glue/jingle_thread.h" 38 #include "remoting/jingle_glue/jingle_thread.h"
39 #include "remoting/proto/auth.pb.h" 39 #include "remoting/proto/auth.pb.h"
40 #include "remoting/protocol/connection_to_host.h" 40 #include "remoting/protocol/connection_to_host.h"
41 #include "remoting/protocol/host_stub.h"
41 // TODO(sergeyu): This is a hack: plugin should not depend on webkit 42 // TODO(sergeyu): This is a hack: plugin should not depend on webkit
42 // glue. It is used here to get P2PPacketDispatcher corresponding to 43 // glue. It is used here to get P2PPacketDispatcher corresponding to
43 // the current RenderView. Use P2P Pepper API for connection and 44 // the current RenderView. Use P2P Pepper API for connection and
44 // remove these includes. 45 // remove these includes.
45 // crbug.com/74951 46 // crbug.com/74951
46 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" 47 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
47 #include "webkit/plugins/ppapi/resource_tracker.h" 48 #include "webkit/plugins/ppapi/resource_tracker.h"
48 49
49 namespace remoting { 50 namespace remoting {
50 51
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 return instance_object_; 292 return instance_object_;
292 } 293 }
293 294
294 ChromotingStats* ChromotingInstance::GetStats() { 295 ChromotingStats* ChromotingInstance::GetStats() {
295 if (!client_.get()) 296 if (!client_.get())
296 return NULL; 297 return NULL;
297 return client_->GetStats(); 298 return client_->GetStats();
298 } 299 }
299 300
300 } // namespace remoting 301 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/input_handler.cc ('k') | remoting/protocol/buffered_socket_writer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698