Refactor the various ways to control what users can do to extensions.

chrome/browser/extensions/extension_prefs.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 CHROME_BROWSER_EXTENSIONS_EXTENSION_PREFS_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_PREFS_H_
 #pragma once
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_store.h"
 #include "chrome/browser/extensions/extension_prefs_scope.h"
 #include "chrome/browser/extensions/extension_scoped_prefs.h"
+#include "chrome/browser/extensions/management_policy.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/string_ordinal.h"
 
 class ExtensionPrefValueMap;
 class ExtensionSorting;
 class PrefService;
 class URLPatternSet;
 
 namespace extensions {
 struct AlarmPref;
 struct ExtensionOmniboxSuggestion;
 }
 
 // Class for managing global and per-extension preferences.
 //
 // This class distinguishes the following kinds of preferences:
 // - global preferences:
 //       internal state for the extension system in general, not associated
 //       with an individual extension, such as lastUpdateTime.
 // - per-extension preferences:
 //       meta-preferences describing properties of the extension like
 //       installation time, whether the extension is enabled, etc.
 // - extension controlled preferences:
 //       browser preferences that an extension controls. For example, an
 //       extension could use the proxy API to specify the browser's proxy
 //       preference. Extension-controlled preferences are stored in
 //       PrefValueStore::extension_prefs(), which this class populates and
 //       maintains as the underlying extensions change.
 class ExtensionPrefs : public extensions::ContentSettingsStore::Observer,
+                       public extensions::ManagementPolicy::Provider,
                        public ExtensionScopedPrefs {
  public:
   // Key name for a preference that keeps track of per-extension settings. This
   // is a dictionary object read from the Preferences file, keyed off of
   // extension ids.
   static const char kExtensionsPref[];
 
   typedef std::vector<linked_ptr<extensions::ExtensionInfo> > ExtensionsInfo;
 
   // Vector containing identifiers for preferences.
@@ skipping 141 matching lines @@
 
   // The oauth client id used for app notification setup, if any.
   std::string GetAppNotificationClientId(const std::string& extension_id) const;
   void SetAppNotificationClientId(const std::string& extension_id,
                                   const std::string& oauth_client_id);
 
   // Whether app notifications are disabled for the given app.
   bool IsAppNotificationDisabled(const std::string& extension_id) const;
   void SetAppNotificationDisabled(const std::string& extension_id, bool value);
 
-  // Is the extension with |extension_id| allowed by policy (checking both
-  // whitelist and blacklist).
-  bool IsExtensionAllowedByPolicy(const std::string& extension_id,
-      extensions::Extension::Location location) const;
+  // ManagementPolicy::Provider
+  virtual std::string PolicyProviderName() const OVERRIDE;
+  // Retruns true if the extension is allowed by admin policy.

[Aaron Boodman, 2012/05/24 08:11:23]

sp: Retruns

+  virtual bool UserMayLoad(const extensions::Extension* extension,

[Pam (message me for reviews), 2012/05/22 12:51:07]

I clarified that this particular management policy provider is checking the
admin policy.

[Aaron Boodman, 2012/05/22 15:56:11]

Ah. You could make that more self-documenting and flexible by factoring this out
into a small helper class which implements ManagementPolicy::Provider.
ExtensionPrefs would have GetAdminPolicyProvider().

[Pam (message me for reviews), 2012/05/23 15:00:58]

How important is this to you? It feels like overcomplication to me.

[Aaron Boodman, 2012/05/24 08:11:23]

Shrug, ok.

+                           extensions::Extension::Location location,
+                           string16* error) const OVERRIDE;
 
   // Checks if extensions are blacklisted by default, by policy. When true, this
   // means that even extensions without an ID should be blacklisted (e.g.
   // from the command line, or when loaded as an unpacked extension).
   // IsExtensionAllowedByPolicy() also takes this into account, and should be
   // used instead when the extension ID is known.
   bool ExtensionsBlacklistedByDefault() const;
 
   // Returns the last value set via SetLastPingDay. If there isn't such a
   // pref, the returned Time will return true for is_null().
@@ skipping 318 matching lines @@
   // Contains all the logic for handling the order for various extension
   // properties.
   scoped_ptr<ExtensionSorting> extension_sorting_;
 
   scoped_refptr<extensions::ContentSettingsStore> content_settings_store_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionPrefs);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_PREFS_H_