| Index: chromeos/dbus/shill_manager_client.h
|
| diff --git a/chromeos/dbus/shill_manager_client.h b/chromeos/dbus/shill_manager_client.h
|
| index 8bc72512c9d5ddd72bea29d8b42afda97eebace4..9b9541dadfb1377058733cf458190f9dacc871a3 100644
|
| --- a/chromeos/dbus/shill_manager_client.h
|
| +++ b/chromeos/dbus/shill_manager_client.h
|
| @@ -14,12 +14,10 @@
|
| #include "chromeos/dbus/shill_client_helper.h"
|
|
|
| namespace dbus {
|
| +
|
| class ObjectPath;
|
| -}
|
| -
|
| -namespace net {
|
| -class IPEndPoint;
|
| -}
|
| +
|
| +} // namespace dbus
|
|
|
| namespace chromeos {
|
|
|
| @@ -195,53 +193,35 @@
|
| const ObjectPathCallback& callback,
|
| const ErrorCallback& error_callback) = 0;
|
|
|
| - // Verifies that the given data corresponds to a trusted device, and returns
|
| - // true to the callback if it is.
|
| + // Verify that the given data corresponds to a trusted device, and return true
|
| + // to the callback if it is.
|
| virtual void VerifyDestination(const VerificationProperties& properties,
|
| const BooleanCallback& callback,
|
| const ErrorCallback& error_callback) = 0;
|
|
|
| - // Verifies that the given data corresponds to a trusted device, and if it is,
|
| - // returns the encrypted credentials for connecting to the network represented
|
| + // Verify that the given data corresponds to a trusted device, and if it is,
|
| + // return the encrypted credentials for connecting to the network represented
|
| // by the given |service_path|, encrypted using the |public_key| for the
|
| - // trusted device. If the device is not trusted, returns the empty string.
|
| + // trusted device. If the device is not trusted, return the empty string.
|
| virtual void VerifyAndEncryptCredentials(
|
| const VerificationProperties& properties,
|
| const std::string& service_path,
|
| const StringCallback& callback,
|
| const ErrorCallback& error_callback) = 0;
|
|
|
| - // Verifies that the given data corresponds to a trusted device, and returns
|
| - // the |data| encrypted using the |public_key| for the trusted device. If the
|
| - // device is not trusted, returns the empty string.
|
| + // Verify that the given data corresponds to a trusted device, and return the
|
| + // |data| encrypted using the |public_key| for the trusted device. If the
|
| + // device is not trusted, return the empty string.
|
| virtual void VerifyAndEncryptData(const VerificationProperties& properties,
|
| const std::string& data,
|
| const StringCallback& callback,
|
| const ErrorCallback& error_callback) = 0;
|
|
|
| - // For each technology present, connects to the "best" service available.
|
| + // For each technology present, connect to the "best" service available.
|
| // Called once the user is logged in and certificates are loaded.
|
| virtual void ConnectToBestServices(const base::Closure& callback,
|
| const ErrorCallback& error_callback) = 0;
|
|
|
| - // Requests that shill program the NIC so that packets incoming on
|
| - // |ip_connection| wake up the CPU.
|
| - virtual void AddWakeOnPacketConnection(
|
| - const net::IPEndPoint& ip_endpoint,
|
| - const base::Closure& callback,
|
| - const ErrorCallback& error_callback) = 0;
|
| -
|
| - // Removes a request to wake up on packets coming on |ip_connection|.
|
| - virtual void RemoveWakeOnPacketConnection(
|
| - const net::IPEndPoint& ip_endpoint,
|
| - const base::Closure& callback,
|
| - const ErrorCallback& error_callback) = 0;
|
| -
|
| - // Clears all requests to wake up on packets.
|
| - virtual void RemoveAllWakeOnPacketConnections(
|
| - const base::Closure& callback,
|
| - const ErrorCallback& error_callback) = 0;
|
| -
|
| // Returns an interface for testing (stub only), or returns NULL.
|
| virtual TestInterface* GetTestInterface() = 0;
|
|
|
|
|