Chromium Code Reviews| Index: chrome/browser/policy/browser_policy_connector.cc |
| diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc |
| index c32f4269976ec8d0ef113323f9989d007848780a..4c22f5d600b849ba1a195c078fcc8fb00a6bd7cd 100644 |
| --- a/chrome/browser/policy/browser_policy_connector.cc |
| +++ b/chrome/browser/policy/browser_policy_connector.cc |
| @@ -4,6 +4,8 @@ |
| #include "chrome/browser/policy/browser_policy_connector.h" |
| +#include <vector> |
|
Mattias Nissler (ping if slow)
2011/09/30 09:01:33
what is this needed for?
simo
2011/09/30 13:00:41
Forgot to remove it.
|
| + |
| #include "base/command_line.h" |
| #include "base/path_service.h" |
| #include "chrome/browser/net/gaia/token_service.h" |
| @@ -265,6 +267,11 @@ const CloudPolicyDataStore* |
| return user_data_store_.get(); |
| } |
| +const HandlerList* |
| + BrowserPolicyConnector::GetConfigurationPolicyHandlerList() const { |
| + return &policy_handlers_; |
| +} |
| + |
| BrowserPolicyConnector::BrowserPolicyConnector() |
| : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) { |
| managed_platform_provider_.reset(CreateManagedPlatformProvider()); |
| @@ -280,6 +287,7 @@ BrowserPolicyConnector::BrowserPolicyConnector() |
| #if defined(OS_CHROMEOS) |
| InitializeDevicePolicy(); |
| #endif |
| + MakeConfigurationPolicyHandlers(&policy_handlers_); |
| } |
| BrowserPolicyConnector::BrowserPolicyConnector( |
| @@ -291,7 +299,9 @@ BrowserPolicyConnector::BrowserPolicyConnector( |
| recommended_platform_provider_(recommended_platform_provider), |
| managed_cloud_provider_(managed_cloud_provider), |
| recommended_cloud_provider_(recommended_cloud_provider), |
| - ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {} |
| + ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) { |
| + MakeConfigurationPolicyHandlers(&policy_handlers_); |
| +} |
| void BrowserPolicyConnector::Observe(int type, |
| const NotificationSource& source, |