OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chromeos/dbus/services/console_service_provider.h" | 5 #include "chromeos/dbus/services/console_service_provider.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "base/bind.h" | 9 #include "base/bind.h" |
8 #include "dbus/message.h" | 10 #include "dbus/message.h" |
9 #include "third_party/cros_system_api/dbus/service_constants.h" | 11 #include "third_party/cros_system_api/dbus/service_constants.h" |
10 | 12 |
11 namespace chromeos { | 13 namespace chromeos { |
12 namespace { | 14 namespace { |
13 | 15 |
14 void OnDisplayOwnershipChanged( | 16 void OnDisplayOwnershipChanged( |
15 const dbus::ExportedObject::ResponseSender& response_sender, | 17 const dbus::ExportedObject::ResponseSender& response_sender, |
16 scoped_ptr<dbus::Response> response, | 18 scoped_ptr<dbus::Response> response, |
17 bool status) { | 19 bool status) { |
18 dbus::MessageWriter writer(response.get()); | 20 dbus::MessageWriter writer(response.get()); |
19 writer.AppendBool(status); | 21 writer.AppendBool(status); |
20 response_sender.Run(response.Pass()); | 22 response_sender.Run(std::move(response)); |
21 } | 23 } |
22 | 24 |
23 } // namespace | 25 } // namespace |
24 | 26 |
25 ConsoleServiceProvider::ConsoleServiceProvider(scoped_ptr<Delegate> delegate) | 27 ConsoleServiceProvider::ConsoleServiceProvider(scoped_ptr<Delegate> delegate) |
26 : delegate_(delegate.Pass()), | 28 : delegate_(std::move(delegate)), weak_ptr_factory_(this) {} |
27 weak_ptr_factory_(this) { | |
28 } | |
29 | 29 |
30 ConsoleServiceProvider::~ConsoleServiceProvider() { | 30 ConsoleServiceProvider::~ConsoleServiceProvider() { |
31 } | 31 } |
32 | 32 |
33 void ConsoleServiceProvider::Start( | 33 void ConsoleServiceProvider::Start( |
34 scoped_refptr<dbus::ExportedObject> exported_object) { | 34 scoped_refptr<dbus::ExportedObject> exported_object) { |
35 exported_object->ExportMethod( | 35 exported_object->ExportMethod( |
36 kLibCrosServiceInterface, kTakeDisplayOwnership, | 36 kLibCrosServiceInterface, kTakeDisplayOwnership, |
37 base::Bind(&ConsoleServiceProvider::TakeDisplayOwnership, | 37 base::Bind(&ConsoleServiceProvider::TakeDisplayOwnership, |
38 weak_ptr_factory_.GetWeakPtr()), | 38 weak_ptr_factory_.GetWeakPtr()), |
(...skipping 25 matching lines...) Expand all Loading... |
64 } | 64 } |
65 | 65 |
66 void ConsoleServiceProvider::OnExported(const std::string& interface_name, | 66 void ConsoleServiceProvider::OnExported(const std::string& interface_name, |
67 const std::string& method_name, | 67 const std::string& method_name, |
68 bool success) { | 68 bool success) { |
69 if (!success) | 69 if (!success) |
70 LOG(ERROR) << "failed to export " << interface_name << "." << method_name; | 70 LOG(ERROR) << "failed to export " << interface_name << "." << method_name; |
71 } | 71 } |
72 | 72 |
73 } // namespace chromeos | 73 } // namespace chromeos |
OLD | NEW |