Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2186)

Unified Diff: chrome/browser/policy/browser_policy_connector.cc

Issue 8139029: Make policy errors available to display in about:policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bad commit Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 38ed053b350a46afb26a2d8ecf49978b396eb95c..ba89bfd0e9300e15c9187b7124e12b842973cf35 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -8,6 +8,7 @@
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/path_service.h"
+#include "base/stl_util.h"
#include "chrome/browser/net/gaia/token_service.h"
#include "chrome/browser/policy/cloud_policy_provider.h"
#include "chrome/browser/policy/cloud_policy_provider_impl.h"
@@ -96,6 +97,8 @@ BrowserPolicyConnector::~BrowserPolicyConnector() {
user_cloud_policy_subsystem_.reset();
user_policy_token_cache_.reset();
user_data_store_.reset();
+
+ STLDeleteElements(policy_handlers_.get());
}
ConfigurationPolicyProvider*
@@ -307,6 +310,11 @@ const CloudPolicyDataStore*
return user_data_store_.get();
}
+const ConfigurationPolicyHandler::HandlerList*
+ BrowserPolicyConnector::GetConfigurationPolicyHandlerList() const {
+ return policy_handlers_.get();
+}
+
BrowserPolicyConnector::BrowserPolicyConnector()
: ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
managed_platform_provider_.reset(CreateManagedPlatformProvider());
@@ -322,6 +330,7 @@ BrowserPolicyConnector::BrowserPolicyConnector()
#if defined(OS_CHROMEOS)
InitializeDevicePolicy();
#endif
+ policy_handlers_.reset(ConfigurationPolicyHandler::CreateHandlerList());
}
BrowserPolicyConnector::BrowserPolicyConnector(
@@ -333,7 +342,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(weak_ptr_factory_(this)) {}
+ ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
+ policy_handlers_.reset(ConfigurationPolicyHandler::CreateHandlerList());
+}
void BrowserPolicyConnector::Observe(int type,
const NotificationSource& source,

Powered by Google App Engine
This is Rietveld 408576698