| Index: chromeos/dbus/auth_policy_client.h
|
| diff --git a/chromeos/dbus/auth_policy_client.h b/chromeos/dbus/auth_policy_client.h
|
| index 2ebc05c5ca995654b7fbd3967782d6f0068e6894..c8d9b13355a2033578536dfb8247d1e541bd5af2 100644
|
| --- a/chromeos/dbus/auth_policy_client.h
|
| +++ b/chromeos/dbus/auth_policy_client.h
|
| @@ -12,18 +12,6 @@
|
| #include "chromeos/dbus/dbus_client.h"
|
| #include "third_party/cros_system_api/dbus/service_constants.h"
|
|
|
| -// TODO(rsorokin): Switch to service constants when it's landed.
|
| -// (see crbug.com/659732)
|
| -namespace authpolicy {
|
| -namespace types {
|
| -enum ADJoinErrorType {
|
| - AD_JOIN_ERROR_NONE = 0,
|
| - AD_JOIN_ERROR_UNKNOWN = 1,
|
| - AD_JOIN_ERROR_DBUS_FAIL = 2,
|
| -};
|
| -} // namespace types
|
| -} // namespace authpolicy
|
| -
|
| namespace chromeos {
|
|
|
| // AuthPolicyClient is used to communicate with the org.chromium.AuthPolicy
|
| @@ -33,9 +21,9 @@ class CHROMEOS_EXPORT AuthPolicyClient : public DBusClient {
|
| public:
|
| // |user_id| is a unique id for the users. Using objectGUID from Active
|
| // Directory server.
|
| - using AuthCallback = base::Callback<void(authpolicy::AuthUserErrorType error,
|
| + using AuthCallback = base::Callback<void(authpolicy::ErrorType error,
|
| const std::string& user_id)>;
|
| - using JoinCallback = base::Callback<void(int error_code)>;
|
| + using JoinCallback = base::Callback<void(authpolicy::ErrorType error)>;
|
| using RefreshPolicyCallback = base::Callback<void(bool success)>;
|
|
|
| ~AuthPolicyClient() override;
|
|
|