| Index: chrome/browser/ui/webui/options/managed_user_import_handler.h
|
| diff --git a/chrome/browser/ui/webui/options/managed_user_import_handler.h b/chrome/browser/ui/webui/options/managed_user_import_handler.h
|
| index 2128a41f68883fb03b0cfe551a497f856e7600e2..52d129f1a132a6606166d57f5ea5638903062ca0 100644
|
| --- a/chrome/browser/ui/webui/options/managed_user_import_handler.h
|
| +++ b/chrome/browser/ui/webui/options/managed_user_import_handler.h
|
| @@ -8,7 +8,7 @@
|
| #include "base/callback_list.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/scoped_observer.h"
|
| -#include "chrome/browser/managed_mode/managed_user_sync_service_observer.h"
|
| +#include "chrome/browser/supervised_user/supervised_user_sync_service_observer.h"
|
| #include "chrome/browser/ui/webui/options/options_ui.h"
|
| #include "components/signin/core/browser/signin_error_controller.h"
|
|
|
| @@ -21,7 +21,7 @@ namespace options {
|
|
|
| // Handler for the 'import existing managed user' dialog.
|
| class ManagedUserImportHandler : public OptionsPageUIHandler,
|
| - public ManagedUserSyncServiceObserver,
|
| + public SupervisedUserSyncServiceObserver,
|
| public SigninErrorController::Observer {
|
| public:
|
| typedef base::CallbackList<void(const std::string&, const std::string&)>
|
| @@ -38,11 +38,11 @@ class ManagedUserImportHandler : public OptionsPageUIHandler,
|
| // WebUIMessageHandler implementation.
|
| virtual void RegisterMessages() OVERRIDE;
|
|
|
| - // ManagedUserSyncServiceObserver implementation.
|
| - virtual void OnManagedUserAcknowledged(const std::string& managed_user_id)
|
| - OVERRIDE {}
|
| - virtual void OnManagedUsersSyncingStopped() OVERRIDE {}
|
| - virtual void OnManagedUsersChanged() OVERRIDE;
|
| + // SupervisedUserSyncServiceObserver implementation.
|
| + virtual void OnSupervisedUserAcknowledged(
|
| + const std::string& supervised_user_id) OVERRIDE {}
|
| + virtual void OnSupervisedUsersSyncingStopped() OVERRIDE {}
|
| + virtual void OnSupervisedUsersChanged() OVERRIDE;
|
|
|
| // SigninErrorController::Observer implementation.
|
| virtual void OnErrorChanged() OVERRIDE;
|
|
|