| Index: chrome/browser/profiles/profile_manager.h
|
| diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
|
| index d71c1d70513191f683834de6a8cf430864b9c9ed..02334bf8079fc052535ffdea8909a78eb0c3d192 100644
|
| --- a/chrome/browser/profiles/profile_manager.h
|
| +++ b/chrome/browser/profiles/profile_manager.h
|
| @@ -86,7 +86,7 @@ class ProfileManager : public base::NonThreadSafe,
|
| const CreateCallback& callback,
|
| const base::string16& name,
|
| const base::string16& icon_url,
|
| - const std::string& managed_user_id);
|
| + const std::string& supervised_user_id);
|
|
|
| // Returns true if the profile pointer is known to point to an existing
|
| // profile.
|
| @@ -134,7 +134,7 @@ class ProfileManager : public base::NonThreadSafe,
|
| const base::string16& name,
|
| const base::string16& icon_url,
|
| const CreateCallback& callback,
|
| - const std::string& managed_user_id);
|
| + const std::string& supervised_user_id);
|
|
|
| // Returns the full path to be used for guest profiles.
|
| static base::FilePath GetGuestProfilePath();
|
| @@ -298,10 +298,11 @@ class ProfileManager : public base::NonThreadSafe,
|
| // If the |loaded_profile| has been loaded successfully (according to
|
| // |status|) and isn't already scheduled for deletion, then finishes adding
|
| // |profile_to_delete_dir| to the queue of profiles to be deleted, and updates
|
| - // the kProfileLastUsed preference based on |last_non_managed_profile_path|.
|
| + // the kProfileLastUsed preference based on
|
| + // |last_non_supervised_profile_path|.
|
| void OnNewActiveProfileLoaded(
|
| const base::FilePath& profile_to_delete_path,
|
| - const base::FilePath& last_non_managed_profile_path,
|
| + const base::FilePath& last_non_supervised_profile_path,
|
| const CreateCallback& original_callback,
|
| Profile* loaded_profile,
|
| Profile::CreateStatus status);
|
|
|