Index: chrome/browser/chromeos/login/session/user_session_manager.cc |
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc |
index 374cf3fa791745c104d82238fc08ed93612b7b1e..57eb45bb1f39e1363195c74e36ef25ce6b7820e3 100644 |
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc |
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc |
@@ -47,6 +47,7 @@ |
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
#include "chrome/browser/chromeos/profiles/profile_helper.h" |
#include "chrome/browser/chromeos/settings/cros_settings.h" |
+#include "chrome/browser/component_updater/ev_whitelist_component_installer.h" |
#include "chrome/browser/first_run/first_run.h" |
#include "chrome/browser/google/google_brand_chromeos.h" |
#include "chrome/browser/lifetime/application_lifetime.h" |
@@ -876,6 +877,7 @@ void UserSessionManager::FinalizePrepareProfile(Profile* profile) { |
InitRlz(profile); |
InitializeCerts(profile); |
InitializeCRLSetFetcher(user); |
+ InitializeEVCertificatesWhitelistComponent(user); |
} |
UpdateEasyUnlockKeys(user_context_); |
@@ -1109,6 +1111,18 @@ void UserSessionManager::InitializeCRLSetFetcher( |
} |
} |
+void UserSessionManager::InitializeEVCertificatesWhitelistComponent( |
+ const user_manager::User* user) { |
+ const std::string username_hash = user->username_hash(); |
+ component_updater::ComponentUpdateService* cus = |
+ g_browser_process->component_updater(); |
+ if (!username_hash.empty() && cus) { |
+ base::FilePath path; |
Sorin Jianu
2014/11/07 17:30:44
path can be initialized here and be declared const
Eran Messeri
2014/11/10 22:54:56
Done.
|
+ path = ProfileHelper::GetProfilePathByUserIdHash(username_hash); |
+ RegisterEVWhitelistComponent(cus, path); |
+ } |
+} |
+ |
void UserSessionManager::OnRestoreActiveSessions( |
const SessionManagerClient::ActiveSessionsMap& sessions, |
bool success) { |