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

Side by Side Diff: device/bluetooth/dbus/bluetooth_agent_service_provider.cc

Issue 1544323002: Convert Pass()→std::move() in //device (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
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 "device/bluetooth/dbus/bluetooth_agent_service_provider.h" 5 #include "device/bluetooth/dbus/bluetooth_agent_service_provider.h"
6 6
7 #include <utility>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/logging.h" 10 #include "base/logging.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
11 #include "base/threading/platform_thread.h" 13 #include "base/threading/platform_thread.h"
12 #include "dbus/exported_object.h" 14 #include "dbus/exported_object.h"
13 #include "dbus/message.h" 15 #include "dbus/message.h"
14 #include "device/bluetooth/dbus/bluez_dbus_manager.h" 16 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
15 #include "device/bluetooth/dbus/fake_bluetooth_agent_service_provider.h" 17 #include "device/bluetooth/dbus/fake_bluetooth_agent_service_provider.h"
16 #include "third_party/cros_system_api/dbus/service_constants.h" 18 #include "third_party/cros_system_api/dbus/service_constants.h"
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 Delegate::Status status, 318 Delegate::Status status,
317 const std::string& pincode) { 319 const std::string& pincode) {
318 DCHECK(OnOriginThread()); 320 DCHECK(OnOriginThread());
319 321
320 switch (status) { 322 switch (status) {
321 case Delegate::SUCCESS: { 323 case Delegate::SUCCESS: {
322 scoped_ptr<dbus::Response> response( 324 scoped_ptr<dbus::Response> response(
323 dbus::Response::FromMethodCall(method_call)); 325 dbus::Response::FromMethodCall(method_call));
324 dbus::MessageWriter writer(response.get()); 326 dbus::MessageWriter writer(response.get());
325 writer.AppendString(pincode); 327 writer.AppendString(pincode);
326 response_sender.Run(response.Pass()); 328 response_sender.Run(std::move(response));
327 break; 329 break;
328 } 330 }
329 case Delegate::REJECTED: { 331 case Delegate::REJECTED: {
330 response_sender.Run(dbus::ErrorResponse::FromMethodCall( 332 response_sender.Run(dbus::ErrorResponse::FromMethodCall(
331 method_call, bluetooth_agent::kErrorRejected, "rejected")); 333 method_call, bluetooth_agent::kErrorRejected, "rejected"));
332 break; 334 break;
333 } 335 }
334 case Delegate::CANCELLED: { 336 case Delegate::CANCELLED: {
335 response_sender.Run(dbus::ErrorResponse::FromMethodCall( 337 response_sender.Run(dbus::ErrorResponse::FromMethodCall(
336 method_call, bluetooth_agent::kErrorCanceled, "canceled")); 338 method_call, bluetooth_agent::kErrorCanceled, "canceled"));
(...skipping 10 matching lines...) Expand all
347 Delegate::Status status, 349 Delegate::Status status,
348 uint32_t passkey) { 350 uint32_t passkey) {
349 DCHECK(OnOriginThread()); 351 DCHECK(OnOriginThread());
350 352
351 switch (status) { 353 switch (status) {
352 case Delegate::SUCCESS: { 354 case Delegate::SUCCESS: {
353 scoped_ptr<dbus::Response> response( 355 scoped_ptr<dbus::Response> response(
354 dbus::Response::FromMethodCall(method_call)); 356 dbus::Response::FromMethodCall(method_call));
355 dbus::MessageWriter writer(response.get()); 357 dbus::MessageWriter writer(response.get());
356 writer.AppendUint32(passkey); 358 writer.AppendUint32(passkey);
357 response_sender.Run(response.Pass()); 359 response_sender.Run(std::move(response));
358 break; 360 break;
359 } 361 }
360 case Delegate::REJECTED: { 362 case Delegate::REJECTED: {
361 response_sender.Run(dbus::ErrorResponse::FromMethodCall( 363 response_sender.Run(dbus::ErrorResponse::FromMethodCall(
362 method_call, bluetooth_agent::kErrorRejected, "rejected")); 364 method_call, bluetooth_agent::kErrorRejected, "rejected"));
363 break; 365 break;
364 } 366 }
365 case Delegate::CANCELLED: { 367 case Delegate::CANCELLED: {
366 response_sender.Run(dbus::ErrorResponse::FromMethodCall( 368 response_sender.Run(dbus::ErrorResponse::FromMethodCall(
367 method_call, bluetooth_agent::kErrorCanceled, "canceled")); 369 method_call, bluetooth_agent::kErrorCanceled, "canceled"));
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 const dbus::ObjectPath& object_path, 438 const dbus::ObjectPath& object_path,
437 Delegate* delegate) { 439 Delegate* delegate) {
438 if (!bluez::BluezDBusManager::Get()->IsUsingStub()) { 440 if (!bluez::BluezDBusManager::Get()->IsUsingStub()) {
439 return new BluetoothAgentServiceProviderImpl(bus, object_path, delegate); 441 return new BluetoothAgentServiceProviderImpl(bus, object_path, delegate);
440 } else { 442 } else {
441 return new FakeBluetoothAgentServiceProvider(object_path, delegate); 443 return new FakeBluetoothAgentServiceProvider(object_path, delegate);
442 } 444 }
443 } 445 }
444 446
445 } // namespace bluez 447 } // namespace bluez
OLDNEW
« no previous file with comments | « device/bluetooth/bluetooth_socket_net.cc ('k') | device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698