| Index: chrome/browser/supervised_user/supervised_user_registration_utility_stub.h
|
| diff --git a/chrome/browser/managed_mode/managed_user_registration_utility_stub.h b/chrome/browser/supervised_user/supervised_user_registration_utility_stub.h
|
| similarity index 43%
|
| rename from chrome/browser/managed_mode/managed_user_registration_utility_stub.h
|
| rename to chrome/browser/supervised_user/supervised_user_registration_utility_stub.h
|
| index b1880f45aa4a040c45f2ee399784a3ede4c5d6d9..a6ee86a0d2965ba8084c871794c70136bafb914d 100644
|
| --- a/chrome/browser/managed_mode/managed_user_registration_utility_stub.h
|
| +++ b/chrome/browser/supervised_user/supervised_user_registration_utility_stub.h
|
| @@ -2,30 +2,30 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_REGISTRATION_UTILITY_STUB_H_
|
| -#define CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_REGISTRATION_UTILITY_STUB_H_
|
| +#ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_REGISTRATION_UTILITY_STUB_H_
|
| +#define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_REGISTRATION_UTILITY_STUB_H_
|
|
|
| #include <string>
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/strings/string16.h"
|
| -#include "chrome/browser/managed_mode/managed_user_registration_utility.h"
|
| +#include "chrome/browser/supervised_user/supervised_user_registration_utility.h"
|
| #include "google_apis/gaia/google_service_auth_error.h"
|
|
|
| -class ManagedUserRegistrationUtilityStub
|
| - : public ManagedUserRegistrationUtility {
|
| +class SupervisedUserRegistrationUtilityStub
|
| + : public SupervisedUserRegistrationUtility {
|
| public:
|
| - ManagedUserRegistrationUtilityStub();
|
| - virtual ~ManagedUserRegistrationUtilityStub();
|
| + SupervisedUserRegistrationUtilityStub();
|
| + virtual ~SupervisedUserRegistrationUtilityStub();
|
|
|
| - virtual void Register(const std::string& managed_user_id,
|
| - const ManagedUserRegistrationInfo& info,
|
| + virtual void Register(const std::string& supervised_user_id,
|
| + const SupervisedUserRegistrationInfo& info,
|
| const RegistrationCallback& callback) OVERRIDE;
|
|
|
| bool register_was_called() { return register_was_called_; }
|
|
|
| - std::string managed_user_id() { return managed_user_id_; }
|
| + std::string supervised_user_id() { return supervised_user_id_; }
|
|
|
| base::string16 display_name() { return display_name_; }
|
|
|
| @@ -35,13 +35,13 @@ class ManagedUserRegistrationUtilityStub
|
| void RunFailureCallback(GoogleServiceAuthError::State error);
|
|
|
| private:
|
| - RegistrationCallback callback_;
|
| - bool register_was_called_;
|
| - std::string managed_user_id_;
|
| - base::string16 display_name_;
|
| - std::string master_key_;
|
| + RegistrationCallback callback_;
|
| + bool register_was_called_;
|
| + std::string supervised_user_id_;
|
| + base::string16 display_name_;
|
| + std::string master_key_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ManagedUserRegistrationUtilityStub);
|
| + DISALLOW_COPY_AND_ASSIGN(SupervisedUserRegistrationUtilityStub);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_REGISTRATION_UTILITY_STUB_H_
|
| +#endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_REGISTRATION_UTILITY_STUB_H_
|
|
|