Index: chrome/browser/chromeos/login/user_manager_impl.cc |
diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc |
index f6d486216d9c5464b268b2a0a6da61b47598e9d1..2fd3adf063a9c431a2d8abe3a33e387dc97c1c8b 100644 |
--- a/chrome/browser/chromeos/login/user_manager_impl.cc |
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc |
@@ -36,6 +36,7 @@ |
#include "chrome/browser/chromeos/login/login_display.h" |
#include "chrome/browser/chromeos/login/login_utils.h" |
#include "chrome/browser/chromeos/login/multi_profile_user_controller.h" |
+#include "chrome/browser/chromeos/login/owner_settings_service_factory.h" |
#include "chrome/browser/chromeos/login/remove_user_delegate.h" |
#include "chrome/browser/chromeos/login/supervised_user_manager_impl.h" |
#include "chrome/browser/chromeos/login/user_image_manager_impl.h" |
@@ -1563,10 +1564,8 @@ void UserManagerImpl::NotifyOnLogin() { |
// Owner must be first user in session. DeviceSettingsService can't deal with |
// multiple user and will mix up ownership, crbug.com/230018. |
if (GetLoggedInUsers().size() == 1) { |
Nikita (slow)
2014/05/15 12:48:58
When do you plan to remove this restriction?
Can i
ygorshenin1
2014/05/16 12:09:37
No, owner still can't be added as a secondary user
|
- // Indicate to DeviceSettingsService that the owner key may have become |
- // available. |
- DeviceSettingsService::Get()->SetUsername(active_user_->email()); |
- |
+ OwnerSettingsServiceFactory::GetInstance()->SetUsername( |
+ active_user_->email()); |
if (NetworkPortalDetector::IsInitialized()) { |
NetworkPortalDetector::Get()->SetStrategy( |
PortalDetectorStrategy::STRATEGY_ID_SESSION); |