Rename "managed (mode|user)" to "supervised user" (part 6)

chrome/browser/ui/webui/options/supervised_user_import_handler.h

Index: chrome/browser/ui/webui/options/supervised_user_import_handler.h
diff --git a/chrome/browser/ui/webui/options/managed_user_import_handler.h b/chrome/browser/ui/webui/options/supervised_user_import_handler.h
similarity index 53%
rename from chrome/browser/ui/webui/options/managed_user_import_handler.h
rename to chrome/browser/ui/webui/options/supervised_user_import_handler.h
index 52d129f1a132a6606166d57f5ea5638903062ca0..57d24851ffffb85eae3ed5d3233dec397bbc2edf 100644
--- a/chrome/browser/ui/webui/options/managed_user_import_handler.h
+++ b/chrome/browser/ui/webui/options/supervised_user_import_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_MANAGED_USER_IMPORT_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS_MANAGED_USER_IMPORT_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_SUPERVISED_USER_IMPORT_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_SUPERVISED_USER_IMPORT_HANDLER_H_
 
 #include "base/callback_list.h"
 #include "base/memory/weak_ptr.h"
@@ -19,16 +19,16 @@ class ListValue;
 
 namespace options {
 
-// Handler for the 'import existing managed user' dialog.
-class ManagedUserImportHandler : public OptionsPageUIHandler,
-                                 public SupervisedUserSyncServiceObserver,
-                                 public SigninErrorController::Observer {
+// Handler for the 'import existing supervised user' dialog.
+class SupervisedUserImportHandler : public OptionsPageUIHandler,
+                                    public SupervisedUserSyncServiceObserver,
+                                    public SigninErrorController::Observer {
  public:
   typedef base::CallbackList<void(const std::string&, const std::string&)>
       CallbackList;
 
-  ManagedUserImportHandler();
-  virtual ~ManagedUserImportHandler();
+  SupervisedUserImportHandler();
+  virtual ~SupervisedUserImportHandler();
 
   // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(
@@ -48,49 +48,49 @@ class ManagedUserImportHandler : public OptionsPageUIHandler,
   virtual void OnErrorChanged() OVERRIDE;
 
  private:
-  // Clears the cached list of managed users and fetches the new list of managed
-  // users.
-  void FetchManagedUsers();
+  // Clears the cached list of supervised users and fetches the new list of
+  // supervised users.
+  void FetchSupervisedUsers();
 
   // Callback for the "requestManagedUserImportUpdate" message.
   // Checks the sign-in status of the custodian and accordingly
   // sends an update to the WebUI. The update can be to show/hide
-  // an error bubble and update/clear the managed user list.
-  void RequestManagedUserImportUpdate(const base::ListValue* args);
+  // an error bubble and update/clear the supervised user list.
+  void RequestSupervisedUserImportUpdate(const base::ListValue* args);
 
-  // Sends an array of managed users to WebUI. Each entry is of the form:
-  //   managedProfile = {
-  //     id: "Managed User ID",
-  //     name: "Managed User Name",
+  // Sends an array of supervised users to WebUI. Each entry is of the form:
+  //   supervisedProfile = {
+  //     id: "Supervised User ID",
+  //     name: "Supervised User Name",
   //     iconURL: "chrome://path/to/icon/image",
   //     onCurrentDevice: true or false,
   //     needAvatar: true or false
   //   }
-  // The array holds all existing managed users attached to the
+  // The array holds all existing supervised users attached to the
   // custodian's profile which initiated the request.
-  void SendExistingManagedUsers(const base::DictionaryValue* dict);
+  void SendExistingSupervisedUsers(const base::DictionaryValue* dict);
 
-  // Sends messages to the JS side to clear managed users and show an error
+  // Sends messages to the JS side to clear supervised users and show an error
   // bubble.
-  void ClearManagedUsersAndShowError();
+  void ClearSupervisedUsersAndShowError();
 
   bool IsAccountConnected() const;
   bool HasAuthError() const;
 
-  // Called when a managed user shared setting is changed. If the avatar was
-  // changed, FetchManagedUsers() is called.
-  void OnSharedSettingChanged(const std::string& managed_user_id,
+  // Called when a supervised user shared setting is changed. If the avatar was
+  // changed, FetchSupervisedUsers() is called.
+  void OnSharedSettingChanged(const std::string& supervised_user_id,
                               const std::string& key);
 
   scoped_ptr<CallbackList::Subscription> subscription_;
 
-  ScopedObserver<SigninErrorController, ManagedUserImportHandler> observer_;
+  ScopedObserver<SigninErrorController, SupervisedUserImportHandler> observer_;
 
-  base::WeakPtrFactory<ManagedUserImportHandler> weak_ptr_factory_;
+  base::WeakPtrFactory<SupervisedUserImportHandler> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(ManagedUserImportHandler);
+  DISALLOW_COPY_AND_ASSIGN(SupervisedUserImportHandler);
 };
 
 }  // namespace options
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_MANAGED_USER_IMPORT_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_SUPERVISED_USER_IMPORT_HANDLER_H_