Add support for a managed user pref store to PrefService.

base/prefs/pref_value_store.h

 // Copyright (c) 2012 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 BASE_PREFS_PREF_VALUE_STORE_H_
 #define BASE_PREFS_PREF_VALUE_STORE_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 14 matching lines @@
 // the value of a Preference from the source with the highest priority, and
 // allows setting user-defined values for preferences that are not managed.
 //
 // Unless otherwise explicitly noted, all of the methods of this class must
 // be called on the UI thread.
 class BASE_PREFS_EXPORT PrefValueStore {
  public:
   typedef base::Callback<void(const std::string&)> PrefChangedCallback;
 
   // In decreasing order of precedence:
   //   |managed_prefs| contains all preferences from mandatory policies.

[bartfab (slow), 2013/08/29 12:02:02]

|managed_user_prefs| is missing in this comment.

   //   |extension_prefs| contains preference values set by extensions.
   //   |command_line_prefs| contains preference values set by command-line
   //        switches.
   //   |user_prefs| contains all user-set preference values.
   //   |recommended_prefs| contains all preferences from recommended policies.
   //   |default_prefs| contains application-default preference values. It must
   //        be non-null if any preferences are to be registered.
   //
   // |pref_notifier| facilitates broadcasting preference change notifications
   // to the world.
   PrefValueStore(PrefStore* managed_prefs,
+                 PrefStore* managed_user_prefs,
                  PrefStore* extension_prefs,
                  PrefStore* command_line_prefs,
                  PrefStore* user_prefs,
                  PrefStore* recommended_prefs,
                  PrefStore* default_prefs,
                  PrefNotifier* pref_notifier);
   virtual ~PrefValueStore();
 
   // Creates a clone of this PrefValueStore with PrefStores overwritten
   // by the parameters passed, if unequal NULL.
   PrefValueStore* CloneAndSpecialize(PrefStore* managed_prefs,
+                                     PrefStore* managed_user_prefs,
                                      PrefStore* extension_prefs,
                                      PrefStore* command_line_prefs,
                                      PrefStore* user_prefs,
                                      PrefStore* recommended_prefs,
                                      PrefStore* default_prefs,
                                      PrefNotifier* pref_notifier);
 
   // A PrefValueStore can have exactly one callback that is directly
   // notified of preferences changing in the store. This does not
   // filter through the PrefNotifier mechanism, which may not forward
@@ skipping 41 matching lines @@
   // whether there is no higher-priority source controlling it.
   bool PrefValueExtensionModifiable(const char* name) const;
 
   // Update the command line PrefStore with |command_line_prefs|.
   void UpdateCommandLinePrefStore(PrefStore* command_line_prefs);
 
  private:
   // PrefStores must be listed here in order from highest to lowest priority.
   //   MANAGED contains all managed preference values that are provided by
   //      mandatory policies (e.g. Windows Group Policy or cloud policy).
+  //   MANAGED_USER contains preferences that are valid for managed users.
   //   EXTENSION contains preference values set by extensions.
   //   COMMAND_LINE contains preference values set by command-line switches.
   //   USER contains all user-set preference values.
   //   RECOMMENDED contains all preferences that are provided by recommended
   //      policies.
   //   DEFAULT contains all application default preference values.
   enum PrefStoreType {
     // INVALID_STORE is not associated with an actual PrefStore but used as
     // an invalid marker, e.g. as a return value.
     INVALID_STORE = -1,
     MANAGED_STORE = 0,
+    MANAGED_USER_STORE,
     EXTENSION_STORE,
     COMMAND_LINE_STORE,
     USER_STORE,
     RECOMMENDED_STORE,
     DEFAULT_STORE,
     PREF_STORE_TYPE_MAX = DEFAULT_STORE
   };
 
   // Keeps a PrefStore reference on behalf of the PrefValueStore and monitors
   // the PrefStore for changes, forwarding notifications to PrefValueStore. This
@@ skipping 111 matching lines @@
   // A mapping of preference names to their registered types.
   PrefTypeMap pref_types_;
 
   // True if not all of the PrefStores were initialized successfully.
   bool initialization_failed_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefValueStore);
 };
 
 #endif  // BASE_PREFS_PREF_VALUE_STORE_H_