Move user cloud policy to BrowserProcess.

chrome/browser/browser_process_impl.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/browser_process_impl.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
@@ skipping 25 matching lines @@
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/metrics/thread_watcher.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/plugin_data_remover.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
+#include "chrome/browser/policy/profile_policy_connector.h"

[Mattias Nissler (ping if slow), 2011/05/26 10:20:20]

alphabetize

[sfeuz, 2011/05/31 07:32:31]

Done.

+#include "chrome/browser/policy/cloud_policy_cache_base.h"
+#include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/sidebar/sidebar_manager.h"
@@ skipping 63 matching lines @@
       created_watchdog_thread_(false),
 #if defined(OS_CHROMEOS)
       created_web_socket_proxy_thread_(false),
 #endif
       created_profile_manager_(false),
       created_local_state_(false),
       created_icon_manager_(false),
       created_devtools_manager_(false),
       created_sidebar_manager_(false),
       created_browser_policy_connector_(false),
+      created_user_policy_connector_(false),
+      created_managed_cloud_policy_provider_(false),
+      created_recommended_cloud_policy_provider_(false),
       created_notification_ui_manager_(false),
       created_safe_browsing_detection_service_(false),
       module_ref_count_(0),
       did_start_(false),
       checked_for_new_frames_(false),
       using_new_frames_(false) {
   g_browser_process = this;
   clipboard_.reset(new ui::Clipboard);
   main_notification_service_.reset(new NotificationService);
 
@@ skipping 78 matching lines @@
 
     // Cancel pending requests and prevent new requests.
     resource_dispatcher_host()->Shutdown();
   }
 
   ExtensionTabIdMap::GetInstance()->Shutdown();
 
   // The policy providers managed by |browser_policy_connector_| need to shut
   // down while the IO and FILE threads are still alive.
   browser_policy_connector_.reset();
+  user_policy_connector_.reset();
+  managed_cloud_policy_provider_.reset();
+  recommended_cloud_policy_provider_.reset();
 
 #if defined(USE_X11)
   // The IO thread must outlive the BACKGROUND_X11 thread.
   background_x11_thread_.reset();
 #endif
 
   // Wait for removing plugin data to finish before shutting down the IO thread.
   WaitForPluginDataRemoverToFinish();
 
   // Destroying the GpuProcessHostUIShims on the UI thread posts a task to
@@ skipping 286 matching lines @@
 policy::BrowserPolicyConnector* BrowserProcessImpl::browser_policy_connector() {
   DCHECK(CalledOnValidThread());
   if (!created_browser_policy_connector_) {
     DCHECK(browser_policy_connector_.get() == NULL);
     created_browser_policy_connector_ = true;
     browser_policy_connector_.reset(policy::BrowserPolicyConnector::Create());
   }
   return browser_policy_connector_.get();
 }
 
+policy::ProfilePolicyConnector* BrowserProcessImpl::user_policy_connector() {
+  DCHECK(CalledOnValidThread());
+  if (!created_user_policy_connector_) {
+    DCHECK(user_policy_connector_.get() == NULL);
+    created_user_policy_connector_ = true;
+    user_policy_connector_.reset(policy::ProfilePolicyConnector::Create());
+  }
+  return user_policy_connector_.get();
+}
+
+policy::ConfigurationPolicyProvider*
+    BrowserProcessImpl::managed_cloud_policy_provider() {
+  DCHECK(CalledOnValidThread());
+  if (!created_managed_cloud_policy_provider_) {
+    DCHECK(!managed_cloud_policy_provider_.get());
+    created_managed_cloud_policy_provider_ = true;
+    // Combining UserPolicy and DevicePolicy.

[Mattias Nissler (ping if slow), 2011/05/26 10:20:20]

The spelling of "UserPolicy" and "DevicePolicy" suggests they are type names.
Let's just write "user policy" and "device policy".

[sfeuz, 2011/05/31 07:32:31]

Done.

+    managed_cloud_policy_provider_.reset(
+        new policy::CombiningCloudPolicyProvider(
+             policy::ConfigurationPolicyPrefStore::

[Mattias Nissler (ping if slow), 2011/05/26 10:20:20]

Indentation

[sfeuz, 2011/05/31 07:32:31]

Done.

+             GetChromePolicyDefinitionList()));
+    // UserPolicy taking precedence.
+    policy::CloudPolicyProvider* user_policy =
+        user_policy_connector()->GetManagedCloudProvider();
+    if (user_policy)
+      managed_cloud_policy_provider_.get()->AddCloudPolicyProvider(user_policy);
+
+    policy::CloudPolicyProvider* device_policy =
+        browser_policy_connector()->GetManagedCloudProvider();
+    if (device_policy)

[Mattias Nissler (ping if slow), 2011/05/26 10:20:20]

Need curlies for multi-line conditional blocks

[sfeuz, 2011/05/31 07:32:31]

Done.

+      managed_cloud_policy_provider_.get()->
+        AddCloudPolicyProvider(device_policy);

[Mattias Nissler (ping if slow), 2011/05/26 10:20:20]

Indentation

[sfeuz, 2011/05/31 07:32:31]

Done.

+  }
+  return managed_cloud_policy_provider_.get();
+}
+
+policy::ConfigurationPolicyProvider*
+    BrowserProcessImpl::recommended_cloud_policy_provider() {
+  DCHECK(CalledOnValidThread());
+  if (!created_recommended_cloud_policy_provider_) {
+    DCHECK(!recommended_cloud_policy_provider_.get());
+    created_recommended_cloud_policy_provider_ = true;
+    // Combining UserPolicy and DevicePolicy.
+    recommended_cloud_policy_provider_.reset(
+        new policy::CombiningCloudPolicyProvider(
+            policy::ConfigurationPolicyPrefStore::
+            GetChromePolicyDefinitionList()));
+    // UserPolicy taking precedence.
+    policy::CloudPolicyProvider* user_policy =
+        user_policy_connector()->GetRecommendedCloudProvider();
+    if (user_policy)
+      recommended_cloud_policy_provider_.get()->
+          AddCloudPolicyProvider(user_policy);
+
+    policy::CloudPolicyProvider* device_policy =
+        browser_policy_connector()->GetRecommendedCloudProvider();
+    if (device_policy)
+      recommended_cloud_policy_provider_.get()->
+          AddCloudPolicyProvider(device_policy);
+  }
+  return recommended_cloud_policy_provider_.get();
+}
+
 IconManager* BrowserProcessImpl::icon_manager() {
   DCHECK(CalledOnValidThread());
   if (!created_icon_manager_)
     CreateIconManager();
   return icon_manager_.get();
 }
 
 ThumbnailGenerator* BrowserProcessImpl::GetThumbnailGenerator() {
   return &thumbnail_generator_;
 }
@@ skipping 578 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)