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

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

Issue 1584883002: Fix PepperPortAllocatorSession to initialize callback_factory_. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « no previous file | no next file » | 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/plugin/pepper_port_allocator.h" 5 #include "remoting/client/plugin/pepper_port_allocator.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 PepperPortAllocator* allocator, 65 PepperPortAllocator* allocator,
66 const std::string& content_name, 66 const std::string& content_name,
67 int component, 67 int component,
68 const std::string& ice_username_fragment, 68 const std::string& ice_username_fragment,
69 const std::string& ice_password) 69 const std::string& ice_password)
70 : PortAllocatorSessionBase(allocator, 70 : PortAllocatorSessionBase(allocator,
71 content_name, 71 content_name,
72 component, 72 component,
73 ice_username_fragment, 73 ice_username_fragment,
74 ice_password), 74 ice_password),
75 pp_instance_(allocator->pp_instance()) {} 75 pp_instance_(allocator->pp_instance()),
76 callback_factory_(this) {}
76 77
77 PepperPortAllocatorSession::~PepperPortAllocatorSession() {} 78 PepperPortAllocatorSession::~PepperPortAllocatorSession() {}
78 79
79 void PepperPortAllocatorSession::SendSessionRequest(const std::string& host) { 80 void PepperPortAllocatorSession::SendSessionRequest(const std::string& host) {
80 relay_url_loader_.reset(new pp::URLLoader(pp_instance_)); 81 relay_url_loader_.reset(new pp::URLLoader(pp_instance_));
81 pp::URLRequestInfo request_info(pp_instance_); 82 pp::URLRequestInfo request_info(pp_instance_);
82 std::string url = "https://" + host + GetSessionRequestUrl() + "&sn=1"; 83 std::string url = "https://" + host + GetSessionRequestUrl() + "&sn=1";
83 request_info.SetURL(url); 84 request_info.SetURL(url);
84 request_info.SetMethod("GET"); 85 request_info.SetMethod("GET");
85 std::stringstream headers; 86 std::stringstream headers;
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 PepperPortAllocatorFactory::~PepperPortAllocatorFactory() {} 188 PepperPortAllocatorFactory::~PepperPortAllocatorFactory() {}
188 189
189 scoped_ptr<cricket::PortAllocator> 190 scoped_ptr<cricket::PortAllocator>
190 PepperPortAllocatorFactory::CreatePortAllocator( 191 PepperPortAllocatorFactory::CreatePortAllocator(
191 scoped_refptr<protocol::TransportContext> transport_context) { 192 scoped_refptr<protocol::TransportContext> transport_context) {
192 return make_scoped_ptr( 193 return make_scoped_ptr(
193 new PepperPortAllocator(transport_context, pp_instance_)); 194 new PepperPortAllocator(transport_context, pp_instance_));
194 } 195 }
195 196
196 } // namespace remoting 197 } // namespace remoting
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698