Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1861)

Unified Diff: chrome/browser/profiles/profile_manager.h

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_list_desktop.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « chrome/browser/profiles/profile_list_desktop.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698