Device policy infrastructure

chrome/browser/policy/configuration_policy_pref_store.cc

 // Copyright (c) 2011 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/policy/configuration_policy_pref_store.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
-#include "chrome/browser/policy/configuration_policy_provider_keeper.h"
-#include "chrome/browser/policy/device_management_policy_provider.h"
-#include "chrome/browser/policy/profile_policy_context.h"
+#include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/prefs/pref_value_map.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "policy/policy_constants.h"
 
 namespace policy {
@@ skipping 184 matching lines @@
     prefs::kEnableAuthNegotiatePort },
   { Value::TYPE_STRING, kPolicyAuthServerWhitelist,
     prefs::kAuthServerWhitelist },
   { Value::TYPE_STRING, kPolicyAuthNegotiateDelegateWhitelist,
     prefs::kAuthNegotiateDelegateWhitelist },
   { Value::TYPE_STRING, kPolicyGSSAPILibraryName,
     prefs::kGSSAPILibraryName },
   { Value::TYPE_BOOLEAN, kPolicyDisable3DAPIs,
     prefs::kDisable3DAPIs },
   { Value::TYPE_INTEGER, kPolicyPolicyRefreshRate,
-    prefs::kPolicyRefreshRate },
+    prefs::kPolicyUserPolicyRefreshRate },
   { Value::TYPE_BOOLEAN, kPolicyInstantEnabled, prefs::kInstantEnabled },
   { Value::TYPE_BOOLEAN, kPolicyDefaultBrowserSettingEnabled,
     prefs::kDefaultBrowserSettingEnabled },
   { Value::TYPE_BOOLEAN, kPolicyCloudPrintProxyEnabled,
     prefs::kCloudPrintProxyEnabled },
 
 #if defined(OS_CHROMEOS)
   { Value::TYPE_BOOLEAN, kPolicyChromeOsLockOnIdleSuspend,
     prefs::kEnableScreenLock },
 #endif
@@ skipping 487 matching lines @@
   Refresh();
 }
 
 void ConfigurationPolicyPrefStore::OnProviderGoingAway() {
   provider_ = NULL;
 }
 
 // static
 ConfigurationPolicyPrefStore*
 ConfigurationPolicyPrefStore::CreateManagedPlatformPolicyPrefStore() {
-  ConfigurationPolicyProviderKeeper* keeper =
-      g_browser_process->configuration_policy_provider_keeper();
-  return new ConfigurationPolicyPrefStore(keeper->managed_platform_provider());
+  BrowserPolicyConnector* connector =
+      g_browser_process->browser_policy_connector();
+  return new ConfigurationPolicyPrefStore(
+      connector->GetManagedPlatformProvider());
 }
 
 // static
 ConfigurationPolicyPrefStore*
 ConfigurationPolicyPrefStore::CreateManagedCloudPolicyPrefStore(
     Profile* profile) {
-  if (profile) {
-    return new ConfigurationPolicyPrefStore(
-        profile->GetPolicyContext()->GetDeviceManagementPolicyProvider());
+  ConfigurationPolicyProvider* provider = NULL;
+  if (profile)
+    provider = profile->GetPolicyConnector()->GetManagedPolicyProvider();
+  if (!provider) {

[gfeher, 2011/02/14 17:28:50]

Is this logic a temporary thing that will go away in the final design? Otherwise
please explain to me why is this good.

[Mattias Nissler (ping if slow), 2011/02/15 10:15:16]

The point here is that for user policy (i.e. profile != NULL, applying to the
profile's PrefService), we want to return the user policy provider that lives in
the profile's policy connector and for device policy (i.e. profile == NULL,
applies to local_state), we should return provider from the global connector.

But you do have a point, we should probably do this:

if (profile)
  ...
else
  ...

[Jakob Kummerow, 2011/02/21 12:12:15]

Done. And I've thrown in a comment for good measure :-)

+    BrowserPolicyConnector* connector =
+        g_browser_process->browser_policy_connector();

[Mattias Nissler (ping if slow), 2011/02/15 10:15:16]

do we need the connector local? I guess it doesn't help readability much any
longer.

[Jakob Kummerow, 2011/02/21 12:12:15]

We don't need it, but it prevents an ugly line break (at "->").

+    provider = connector->GetManagedCloudProvider();
   }
-  return new ConfigurationPolicyPrefStore(NULL);
+  return new ConfigurationPolicyPrefStore(provider);
 }
 
 // static
 ConfigurationPolicyPrefStore*
 ConfigurationPolicyPrefStore::CreateRecommendedPlatformPolicyPrefStore() {
-  ConfigurationPolicyProviderKeeper* keeper =
-      g_browser_process->configuration_policy_provider_keeper();
-  return new ConfigurationPolicyPrefStore(keeper->recommended_provider());
+  BrowserPolicyConnector* connector =
+      g_browser_process->browser_policy_connector();
+  return new ConfigurationPolicyPrefStore(
+      connector->GetRecommendedPlatformProvider());
 }
 
 // static
 ConfigurationPolicyPrefStore*
 ConfigurationPolicyPrefStore::CreateRecommendedCloudPolicyPrefStore(
     Profile* profile) {
-  return new ConfigurationPolicyPrefStore(NULL);
+  ConfigurationPolicyProvider* provider = NULL;
+  if (profile)
+    provider = profile->GetPolicyConnector()->GetRecommendedPolicyProvider();
+  if (!provider) {

[Mattias Nissler (ping if slow), 2011/02/15 10:15:16]

same here.

[Jakob Kummerow, 2011/02/21 12:12:15]

Done.

+    BrowserPolicyConnector* connector =
+        g_browser_process->browser_policy_connector();

[Mattias Nissler (ping if slow), 2011/02/15 10:15:16]

drop connector local?

[Jakob Kummerow, 2011/02/21 12:12:15]

Same as above -- keeping it as it is for line breaking reasons.

+    provider = connector->GetRecommendedCloudProvider();
+  }
+  return new ConfigurationPolicyPrefStore(provider);
 }
 
 /* static */
 const ConfigurationPolicyProvider::PolicyDefinitionList*
 ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() {
   static ConfigurationPolicyProvider::PolicyDefinitionList::Entry entries[] = {
     { kPolicyHomepageLocation, Value::TYPE_STRING, key::kHomepageLocation },
     { kPolicyHomepageIsNewTabPage, Value::TYPE_BOOLEAN,
       key::kHomepageIsNewTabPage },
     { kPolicyRestoreOnStartup, Value::TYPE_INTEGER, key::kRestoreOnStartup },
@@ skipping 126 matching lines @@
   // Update the initialization flag.
   if (!initialization_complete_ &&
       provider_->IsInitializationComplete()) {
     initialization_complete_ = true;
     FOR_EACH_OBSERVER(PrefStore::Observer, observers_,
                       OnInitializationCompleted());
   }
 }
 
 }  // namespace policy