Implemented profile-aware owner key loading.

chrome/browser/chromeos/login/user_manager_impl.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 
 #include "ash/multi_profile_uma.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/base/locale_util.h"
 #include "chrome/browser/chromeos/login/auth_sync_observer.h"
 #include "chrome/browser/chromeos/login/auth_sync_observer_factory.h"
 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
 #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_key_reloader_service.h"
+#include "chrome/browser/chromeos/login/owner_key_reloader_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"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/net/network_portal_detector.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_strategy.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ skipping 923 matching lines @@
         // Call SwitchActiveUser async because otherwise it may cause
         // ProfileManager::GetProfile before the profile gets registered
         // in ProfileManager. It happens in case of sync profile load when
         // NOTIFICATION_PROFILE_CREATED is called synchronously.
         base::MessageLoop::current()->PostTask(FROM_HERE,
           base::Bind(&UserManagerImpl::SwitchActiveUser,
                      base::Unretained(this),
                      pending_user_switch_));
         pending_user_switch_.clear();
       }
+      if (profile && !ProfileHelper::IsSigninProfile(profile) &&

[Mattias Nissler (ping if slow), 2014/05/14 12:18:10]

Why isn't this just handled by the factory or ctor of the service?

[ygorshenin1, 2014/05/14 15:30:07]

Done.

+          !profile->IsGuestSession()) {
+        OwnerKeyReloaderService* reloader =
+            OwnerKeyReloaderServiceFactory::GetInstance()->GetForProfile(
+                profile);
+        if (reloader)
+          reloader->ReloadOwnerKey();
+      }
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
 void UserManagerImpl::OnExternalDataSet(const std::string& policy,
                                         const std::string& user_id) {
   if (policy == policy::key::kUserAvatarImage)
@@ skipping 564 matching lines @@
   // TODO(nkostylev): Deprecate this notification in favor of
   // ActiveUserChanged() observer call.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_LOGIN_USER_CHANGED,
       content::Source<UserManager>(this),
       content::Details<const User>(active_user_));
 
   // 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) {
-    // Indicate to DeviceSettingsService that the owner key may have become
-    // available.
-    DeviceSettingsService::Get()->SetUsername(active_user_->email());
+    // Try to load owner key for the active user.
+    OwnerKeyReloaderService::SetUsername(active_user_->email());
 
     if (NetworkPortalDetector::IsInitialized()) {
       NetworkPortalDetector::Get()->SetStrategy(
           PortalDetectorStrategy::STRATEGY_ID_SESSION);
     }
   }
 }
 
 User::OAuthTokenStatus UserManagerImpl::LoadUserOAuthStatus(
     const std::string& user_id) const {
@@ skipping 518 matching lines @@
 }
 
 void UserManagerImpl::DeleteUser(User* user) {
   const bool is_active_user = (user == active_user_);
   delete user;
   if (is_active_user)
     active_user_ = NULL;
 }
 
 }  // namespace chromeos