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

Side by Side Diff: chrome/browser/extensions/api/networking_private/networking_private_service_client.cc

Issue 525703002: Fix order or evaluation bug in wifi services code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 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 "chrome/browser/extensions/api/networking_private/networking_private_se rvice_client.h" 5 #include "chrome/browser/extensions/api/networking_private/networking_private_se rvice_client.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/sequenced_task_runner.h" 9 #include "base/sequenced_task_runner.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 const std::string& guid, 167 const std::string& guid,
168 const DictionaryCallback& success_callback, 168 const DictionaryCallback& success_callback,
169 const FailureCallback& failure_callback) { 169 const FailureCallback& failure_callback) {
170 ServiceCallbacks* service_callbacks = AddServiceCallbacks(); 170 ServiceCallbacks* service_callbacks = AddServiceCallbacks();
171 service_callbacks->failure_callback = failure_callback; 171 service_callbacks->failure_callback = failure_callback;
172 service_callbacks->get_properties_callback = success_callback; 172 service_callbacks->get_properties_callback = success_callback;
173 173
174 scoped_ptr<base::DictionaryValue> properties(new base::DictionaryValue); 174 scoped_ptr<base::DictionaryValue> properties(new base::DictionaryValue);
175 std::string* error = new std::string; 175 std::string* error = new std::string;
176 176
177 base::DictionaryValue* properties_ptr = properties.get();
177 task_runner_->PostTaskAndReply( 178 task_runner_->PostTaskAndReply(
178 FROM_HERE, 179 FROM_HERE,
179 base::Bind(&WiFiService::GetProperties, 180 base::Bind(&WiFiService::GetProperties,
180 base::Unretained(wifi_service_.get()), 181 base::Unretained(wifi_service_.get()),
181 guid, 182 guid,
182 properties.get(), 183 properties_ptr,
183 error), 184 error),
184 base::Bind(&NetworkingPrivateServiceClient::AfterGetProperties, 185 base::Bind(&NetworkingPrivateServiceClient::AfterGetProperties,
185 weak_factory_.GetWeakPtr(), 186 weak_factory_.GetWeakPtr(),
186 service_callbacks->id, 187 service_callbacks->id,
187 guid, 188 guid,
188 base::Passed(&properties), 189 base::Passed(&properties),
189 base::Owned(error))); 190 base::Owned(error)));
190 } 191 }
191 192
192 void NetworkingPrivateServiceClient::GetManagedProperties( 193 void NetworkingPrivateServiceClient::GetManagedProperties(
193 const std::string& guid, 194 const std::string& guid,
194 const DictionaryCallback& success_callback, 195 const DictionaryCallback& success_callback,
195 const FailureCallback& failure_callback) { 196 const FailureCallback& failure_callback) {
196 ServiceCallbacks* service_callbacks = AddServiceCallbacks(); 197 ServiceCallbacks* service_callbacks = AddServiceCallbacks();
197 service_callbacks->failure_callback = failure_callback; 198 service_callbacks->failure_callback = failure_callback;
198 service_callbacks->get_properties_callback = success_callback; 199 service_callbacks->get_properties_callback = success_callback;
199 200
200 scoped_ptr<base::DictionaryValue> properties(new base::DictionaryValue); 201 scoped_ptr<base::DictionaryValue> properties(new base::DictionaryValue);
201 std::string* error = new std::string; 202 std::string* error = new std::string;
202 203
204 base::DictionaryValue* properties_ptr = properties.get();
203 task_runner_->PostTaskAndReply( 205 task_runner_->PostTaskAndReply(
204 FROM_HERE, 206 FROM_HERE,
205 base::Bind(&WiFiService::GetManagedProperties, 207 base::Bind(&WiFiService::GetManagedProperties,
206 base::Unretained(wifi_service_.get()), 208 base::Unretained(wifi_service_.get()),
207 guid, 209 guid,
208 properties.get(), 210 properties_ptr,
209 error), 211 error),
210 base::Bind(&NetworkingPrivateServiceClient::AfterGetProperties, 212 base::Bind(&NetworkingPrivateServiceClient::AfterGetProperties,
211 weak_factory_.GetWeakPtr(), 213 weak_factory_.GetWeakPtr(),
212 service_callbacks->id, 214 service_callbacks->id,
213 guid, 215 guid,
214 base::Passed(&properties), 216 base::Passed(&properties),
215 base::Owned(error))); 217 base::Owned(error)));
216 } 218 }
217 219
218 void NetworkingPrivateServiceClient::GetState( 220 void NetworkingPrivateServiceClient::GetState(
219 const std::string& guid, 221 const std::string& guid,
220 const DictionaryCallback& success_callback, 222 const DictionaryCallback& success_callback,
221 const FailureCallback& failure_callback) { 223 const FailureCallback& failure_callback) {
222 ServiceCallbacks* service_callbacks = AddServiceCallbacks(); 224 ServiceCallbacks* service_callbacks = AddServiceCallbacks();
223 service_callbacks->failure_callback = failure_callback; 225 service_callbacks->failure_callback = failure_callback;
224 service_callbacks->get_properties_callback = success_callback; 226 service_callbacks->get_properties_callback = success_callback;
225 227
226 scoped_ptr<base::DictionaryValue> properties(new base::DictionaryValue); 228 scoped_ptr<base::DictionaryValue> properties(new base::DictionaryValue);
227 std::string* error = new std::string; 229 std::string* error = new std::string;
228 230
231 base::DictionaryValue* properties_ptr = properties.get();
229 task_runner_->PostTaskAndReply( 232 task_runner_->PostTaskAndReply(
230 FROM_HERE, 233 FROM_HERE,
231 base::Bind(&WiFiService::GetState, 234 base::Bind(&WiFiService::GetState,
232 base::Unretained(wifi_service_.get()), 235 base::Unretained(wifi_service_.get()),
233 guid, 236 guid,
234 properties.get(), 237 properties_ptr,
235 error), 238 error),
236 base::Bind(&NetworkingPrivateServiceClient::AfterGetProperties, 239 base::Bind(&NetworkingPrivateServiceClient::AfterGetProperties,
237 weak_factory_.GetWeakPtr(), 240 weak_factory_.GetWeakPtr(),
238 service_callbacks->id, 241 service_callbacks->id,
239 guid, 242 guid,
240 base::Passed(&properties), 243 base::Passed(&properties),
241 base::Owned(error))); 244 base::Owned(error)));
242 } 245 }
243 246
244 void NetworkingPrivateServiceClient::SetProperties( 247 void NetworkingPrivateServiceClient::SetProperties(
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 const NetworkListCallback& success_callback, 303 const NetworkListCallback& success_callback,
301 const FailureCallback& failure_callback) { 304 const FailureCallback& failure_callback) {
302 ServiceCallbacks* service_callbacks = AddServiceCallbacks(); 305 ServiceCallbacks* service_callbacks = AddServiceCallbacks();
303 service_callbacks->failure_callback = failure_callback; 306 service_callbacks->failure_callback = failure_callback;
304 service_callbacks->get_visible_networks_callback = success_callback; 307 service_callbacks->get_visible_networks_callback = success_callback;
305 308
306 scoped_ptr<base::ListValue> networks(new base::ListValue); 309 scoped_ptr<base::ListValue> networks(new base::ListValue);
307 310
308 // TODO(stevenjb/mef): Apply filters (configured, visible, limit). 311 // TODO(stevenjb/mef): Apply filters (configured, visible, limit).
309 312
313 base::ListValue* networks_ptr = networks.get();
310 task_runner_->PostTaskAndReply( 314 task_runner_->PostTaskAndReply(
311 FROM_HERE, 315 FROM_HERE,
312 base::Bind(&WiFiService::GetVisibleNetworks, 316 base::Bind(&WiFiService::GetVisibleNetworks,
313 base::Unretained(wifi_service_.get()), 317 base::Unretained(wifi_service_.get()),
314 network_type, 318 network_type,
315 networks.get(), 319 networks_ptr,
316 false), 320 false),
317 base::Bind(&NetworkingPrivateServiceClient::AfterGetVisibleNetworks, 321 base::Bind(&NetworkingPrivateServiceClient::AfterGetVisibleNetworks,
318 weak_factory_.GetWeakPtr(), 322 weak_factory_.GetWeakPtr(),
319 service_callbacks->id, 323 service_callbacks->id,
320 base::Passed(&networks))); 324 base::Passed(&networks)));
321 } 325 }
322 326
323 void NetworkingPrivateServiceClient::StartConnect( 327 void NetworkingPrivateServiceClient::StartConnect(
324 const std::string& guid, 328 const std::string& guid,
325 const VoidCallback& success_callback, 329 const VoidCallback& success_callback,
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 675
672 void NetworkingPrivateServiceClient::OnNetworkListChangedEventOnUIThread( 676 void NetworkingPrivateServiceClient::OnNetworkListChangedEventOnUIThread(
673 const std::vector<std::string>& network_guids) { 677 const std::vector<std::string>& network_guids) {
674 DCHECK_CURRENTLY_ON(BrowserThread::UI); 678 DCHECK_CURRENTLY_ON(BrowserThread::UI);
675 FOR_EACH_OBSERVER(Observer, 679 FOR_EACH_OBSERVER(Observer,
676 network_events_observers_, 680 network_events_observers_,
677 OnNetworkListChangedEvent(network_guids)); 681 OnNetworkListChangedEvent(network_guids));
678 } 682 }
679 683
680 } // namespace extensions 684 } // namespace extensions
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