diff options
| author | ibraaaa@chromium.org <ibraaaa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-05 14:13:13 +0000 |
|---|---|---|
| committer | ibraaaa@chromium.org <ibraaaa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-05 14:13:13 +0000 |
| commit | a6e01b4079bf48ed481b44fb577ab8b40e86effb (patch) | |
| tree | e37cf68b1487e189b3a83af0b6743ddb1fb082fc /chrome/browser/ui/webui/options/browser_options_handler.h | |
| parent | 131eb68a409292e6b7728fa09c0ce8333d59f444 (diff) | |
| download | chromium_src-a6e01b4079bf48ed481b44fb577ab8b40e86effb.zip chromium_src-a6e01b4079bf48ed481b44fb577ab8b40e86effb.tar.gz chromium_src-a6e01b4079bf48ed481b44fb577ab8b40e86effb.tar.bz2 | |
Store the managed user ID in |ProfileInfoCache| instead of |is_managed| flag.
Updates |ProfileManager::CreateMultiProfileAsync| to take |managed_user_id| instead of the |is_managed| flag, the user is managed if |managed_user_id| is not empty.
The preference |prefs::kManagedUserId| is added to hold the managed user ID. |prefs::kProfileIsManaged| should eventually be deleted.
TBR=nkostylev@chromium.org, tapted@chromium.org, jochen@chromium.org
BUG=None
Review URL: https://chromiumcodereview.appspot.com/21496004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215610 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/options/browser_options_handler.h')
| -rw-r--r-- | chrome/browser/ui/webui/options/browser_options_handler.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.h b/chrome/browser/ui/webui/options/browser_options_handler.h index 8c81951..5cd2007 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.h +++ b/chrome/browser/ui/webui/options/browser_options_handler.h @@ -159,6 +159,7 @@ class BrowserOptionsHandler // class) still exists after the new managed profile has been created // asynchronously. void RegisterNewManagedUser(const ProfileManager::CreateCallback& callback, + const std::string& managed_user_id, Profile* new_profile, Profile::CreateStatus status); |