Chromium Code Reviews| Index: chromeos/dbus/permission_broker_client.h |
| diff --git a/chromeos/dbus/permission_broker_client.h b/chromeos/dbus/permission_broker_client.h |
| index f56bfcc64d4239c85dbe05a711a481d514ed5f23..66ec6a5a1bbd09d207ce46f18e5e3f42c6c25eb5 100644 |
| --- a/chromeos/dbus/permission_broker_client.h |
| +++ b/chromeos/dbus/permission_broker_client.h |
| @@ -10,10 +10,10 @@ |
| #include <string> |
| #include "base/callback.h" |
| +#include "base/files/scoped_file.h" |
| #include "base/macros.h" |
| #include "chromeos/chromeos_export.h" |
| #include "chromeos/dbus/dbus_client.h" |
| -#include "dbus/file_descriptor.h" |
| namespace chromeos { |
| @@ -32,7 +32,7 @@ class CHROMEOS_EXPORT PermissionBrokerClient : public DBusClient { |
| typedef base::Callback<void(bool)> ResultCallback; |
| // An OpenPathCallback callback is run when an OpenPath request is completed. |
| - typedef base::Callback<void(dbus::FileDescriptor)> OpenPathCallback; |
| + typedef base::Callback<void(base::ScopedFD)> OpenPathCallback; |
| // An ErrorCallback callback is run when an error is returned by the |
| // permission broker. |
| @@ -64,7 +64,7 @@ class CHROMEOS_EXPORT PermissionBrokerClient : public DBusClient { |
| // permission broker can monitor the lifetime of the calling process. |
|
satorux1
2016/08/31 05:18:08
add some comment about |lifeline_fd| like you did
hashimoto
2016/08/31 07:09:24
Done.
Also reworded the existing comments to avoid
|
| virtual void RequestTcpPortAccess(uint16_t port, |
| const std::string& interface, |
| - const dbus::FileDescriptor& lifeline_fd, |
| + int lifeline_fd, |
| const ResultCallback& callback) = 0; |
| // Requests the |port| be opened on the firewall for incoming UDP packets |
| @@ -73,7 +73,7 @@ class CHROMEOS_EXPORT PermissionBrokerClient : public DBusClient { |
| // monitor the lifetime of the calling process. |
| virtual void RequestUdpPortAccess(uint16_t port, |
| const std::string& interface, |
| - const dbus::FileDescriptor& lifeline_fd, |
| + int lifeline_fd, |
| const ResultCallback& callback) = 0; |
| // Releases a request for an open firewall port for TCP/IP connections. The |