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

Unified Diff: chrome/browser/chromeos/login/user.h

Issue 271533004: Turning on MultiProfile by default for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
Index: chrome/browser/chromeos/login/user.h
diff --git a/chrome/browser/chromeos/login/user.h b/chrome/browser/chromeos/login/user.h
index 58eb1a3ec7dd95b90e98b217d392ca20ac4099ec..36c097d63fd44bfe61026887950219f0d80d134d 100644
--- a/chrome/browser/chromeos/login/user.h
+++ b/chrome/browser/chromeos/login/user.h
@@ -197,6 +197,8 @@ class User : public ash::UserInfo {
return profile_is_created_;
}
+ static User* CreateRegularUser(const std::string& email);
Nikita (slow) 2014/05/14 20:10:16 I don't see this being used in this CL so makes se
zel 2014/05/14 21:17:57 Done.
+
protected:
friend class SupervisedUserManagerImpl;
friend class UserManagerImpl;
@@ -208,7 +210,6 @@ class User : public ash::UserInfo {
friend class UserAddingScreenTest;
// Do not allow anyone else to create new User instances.
- static User* CreateRegularUser(const std::string& email);
static User* CreateGuestUser();
static User* CreateKioskAppUser(const std::string& kiosk_app_username);
static User* CreateLocallyManagedUser(const std::string& username);
@@ -238,7 +239,9 @@ class User : public ash::UserInfo {
display_name_ = display_name;
}
- void set_given_name(const base::string16& given_name) { given_name_ = given_name; }
+ void set_given_name(const base::string16& given_name) {
+ given_name_ = given_name;
+ }
void set_display_email(const std::string& display_email) {
display_email_ = display_email;

Powered by Google App Engine
This is Rietveld 408576698