Chromium Code Reviews| Index: chrome/browser/policy/profile_policy_connector.cc |
| diff --git a/chrome/browser/policy/profile_policy_connector.cc b/chrome/browser/policy/profile_policy_connector.cc |
| index f7e0e5790ea5eff7536cd3e422a01ad7a3cf3668..bf861d31859a8447a46fb74b98337c613b879af0 100644 |
| --- a/chrome/browser/policy/profile_policy_connector.cc |
| +++ b/chrome/browser/policy/profile_policy_connector.cc |
| @@ -23,10 +23,13 @@ |
| #include "chrome/browser/chromeos/login/user.h" |
| #include "chrome/browser/chromeos/login/user_manager.h" |
| #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h" |
| +#include "chrome/browser/chromeos/policy/login_profile_policy_provider.cc" |
|
Mattias Nissler (ping if slow)
2013/06/12 13:55:16
ah, no.
bartfab (slow)
2013/06/12 18:57:49
Huh, where did that come from? Deleted.
|
| +#include "chrome/browser/chromeos/policy/login_profile_policy_provider.h" |
| #include "chrome/browser/chromeos/policy/network_configuration_updater.h" |
| #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" |
| #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h" |
| #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| +#include "chrome/browser/policy/policy_service.h" |
| #include "chrome/common/pref_names.h" |
| #include "chromeos/dbus/cryptohome_client.h" |
| #include "chromeos/dbus/dbus_thread_manager.h" |
| @@ -113,7 +116,12 @@ void ProfilePolicyConnector::Init( |
| bool is_managed = false; |
| std::string username; |
| - if (!chromeos::ProfileHelper::IsSigninProfile(profile_)) { |
| + if (chromeos::ProfileHelper::IsSigninProfile(profile_)) { |
| + login_profile_policy_provider_.reset(new LoginProfilePolicyProvider( |
| + connector->GetPolicyService())); |
| + login_profile_policy_provider_->Init(); |
| + providers.push_back(login_profile_policy_provider_.get()); |
| + } else { |
| // |user| should never be NULL except for the signin profile. |
| // TODO(joaodasilva): get the |user| that corresponds to the |profile_| |
| // from the ProfileHelper, once that's ready. |
| @@ -178,6 +186,8 @@ void ProfilePolicyConnector::Shutdown() { |
| g_browser_process->browser_policy_connector()->SetUserPolicyDelegate(NULL); |
| user_policy_init_observer_.reset(); |
| } |
| + if (login_profile_policy_provider_) |
| + login_profile_policy_provider_->Shutdown(); |
| if (device_local_account_policy_provider_) |
| device_local_account_policy_provider_->Shutdown(); |
| #endif |