Split the policy refresh rate preference into user- and device-policy refresh rate.

chrome/browser/policy/cloud_policy_subsystem.h

 // 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.
 
 #ifndef CHROME_BROWSER_POLICY_CLOUD_POLICY_SUBSYSTEM_H_
 #define CHROME_BROWSER_POLICY_CLOUD_POLICY_SUBSYSTEM_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/prefs/pref_member.h"
@@ skipping 62 matching lines @@
   };
 
   CloudPolicySubsystem(CloudPolicyIdentityStrategy* identity_strategy,
                        CloudPolicyCacheBase* policy_cache);
   virtual ~CloudPolicySubsystem();
 
   // net::NetworkChangeNotifier::IPAddressObserver:
   virtual void OnIPAddressChanged() OVERRIDE;
 
   // Initializes the subsystem.
-  void Initialize(PrefService* prefs,
+  void Initialize(const char* policy_refresh_name,

[Mattias Nissler (ping if slow), 2011/05/13 09:45:03]

it's not a policy name but a pref name.

[sfeuz, 2011/05/17 14:27:42]

Done.

                   net::URLRequestContextGetter* request_context);
 
   // Shuts the subsystem down. This must be called before threading and network
   // infrastructure goes away.
   void Shutdown();
 
   // Returns the externally visible state and corresponding error details.
   PolicySubsystemState state();
   ErrorDetails error_details();
 
@@ skipping 14 matching lines @@
   // Returns a weak pointer to this subsystem's PolicyNotifier.
   PolicyNotifier* notifier() {
     return notifier_.get();
   }
 
   // NotificationObserver overrides.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  // The pref service that controls the refresh rate.
-  PrefService* prefs_;
-
   // Tracks the pref value for the policy refresh rate.
   IntegerPrefMember policy_refresh_rate_;
 
   // Cloud policy infrastructure stuff.
   scoped_ptr<PolicyNotifier> notifier_;
   scoped_ptr<DeviceManagementService> device_management_service_;
   scoped_ptr<DeviceTokenFetcher> device_token_fetcher_;
   scoped_ptr<CloudPolicyCacheBase> cloud_policy_cache_;
   scoped_ptr<CloudPolicyController> cloud_policy_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPolicySubsystem);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_CLOUD_POLICY_SUBSYSTEM_H_