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

chrome/browser/extensions/extension_prefs.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_prefs.h"
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/alarms/alarm_manager.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/browser/prefs/pref_notifier.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_switch_utils.h"
 #include "chrome/common/extensions/manifest.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
+#include "grit/generated_resources.h"
+#include "ui/base/l10n/l10n_util.h"
 
 using extensions::Extension;
 using extensions::ExtensionInfo;
 
 namespace {
 
 // Additional preferences keys
 
 // Where an extension was installed from. (see Extension::Location)
 const char kPrefLocation[] = "location";
@@ skipping 618 matching lines @@
   return ReadExtensionPrefBoolean(extension_id, kPrefAppNotificationDisbaled);
 }
 
 void ExtensionPrefs::SetAppNotificationDisabled(
    const std::string& extension_id, bool value) {
   DCHECK(Extension::IdIsValid(extension_id));
   UpdateExtensionPref(extension_id, kPrefAppNotificationDisbaled,
                       Value::CreateBooleanValue(value));
 }
 
-bool ExtensionPrefs::IsExtensionAllowedByPolicy(
-    const std::string& extension_id,
-    Extension::Location location) const {
-  base::StringValue id_value(extension_id);
+std::string ExtensionPrefs::PolicyProviderName() const {

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

Methods should typically be verb phrases, so GetPolicyProviderName().

+  return "admin policy black/whitelist, via the ExtensionPrefs";
+}
 
-  if (location == Extension::COMPONENT ||
-      location == Extension::EXTERNAL_POLICY_DOWNLOAD) {
+bool ExtensionPrefs::UserMayLoad(const extensions::Extension* extension,
+                                 extensions::Extension::Location location,
+                                 string16* error) const {
+  base::StringValue id_value(extension->id());
+
+  if (extensions::Extension::IsRequired(location))

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

It's a rename (and direction flip) of Extension::UserMayDisable(). It returns
true if an extension must remain installed and enabled, namely if it's a
component or external-policy extension.

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

Ah. Can that bit be moved into extensions::ManagementPolicy? Is there a reason
for it to be accessible on its own?

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

On 2012/05/22 15:56:11, Aaron Boodman wrote:
 Can that bit be moved into extensions::ManagementPolicy? Is there a reason
I don't want to pollute extensions::ManagementPolicy with direct knowledge of
any of the policies.

I assume the former UserMayDisable was in Extension because that's where the
Extension::Location and a bunch of other methods with implementations that only
depend on the location (IsAutoUpdateableLocation, ShouldAlwaysAllowFileAccess,
etc.) are. I can't think of a better place for it, but am open to suggestions.

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

OK, I see.

     return true;
-  }
 
   const base::ListValue* blacklist =
       prefs_->GetList(prefs::kExtensionInstallDenyList);
   if (!blacklist || blacklist->empty())
     return true;
 
   // Check the whitelist first.
   const base::ListValue* whitelist =
       prefs_->GetList(prefs::kExtensionInstallAllowList);
   if (whitelist && whitelist->Find(id_value) != whitelist->end())
     return true;
 
   // Then check the blacklist (the admin blacklist, not the Google blacklist).
-  return blacklist->Find(id_value) == blacklist->end() &&
-         !ExtensionsBlacklistedByDefault();
+  bool result = blacklist->Find(id_value) == blacklist->end() &&
+      !ExtensionsBlacklistedByDefault();
+  if (error && !result) {
+    *error = l10n_util::GetStringFUTF16(
+          IDS_EXTENSION_CANT_INSTALL_POLICY_BLACKLIST,
+          UTF8ToUTF16(extension->name()),
+          UTF8ToUTF16(extension->id()));
+  }
+  return result;
 }
 
 bool ExtensionPrefs::ExtensionsBlacklistedByDefault() const {
   const base::ListValue* blacklist =
       prefs_->GetList(prefs::kExtensionInstallDenyList);
   base::StringValue wildcard("*");
   return blacklist && blacklist->Find(wildcard) != blacklist->end();
 }
 
 bool ExtensionPrefs::DidExtensionEscalatePermissions(
@@ skipping 1216 matching lines @@
   prefs->RegisterStringPref(prefs::kExtensionBlacklistUpdateVersion,
                             "0",  // default value
                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterInt64Pref(prefs::kLastExtensionsUpdateCheck,
                            0,  // default value
                            PrefService::UNSYNCABLE_PREF);
   prefs->RegisterInt64Pref(prefs::kNextExtensionsUpdateCheck,
                            0,  // default value
                            PrefService::UNSYNCABLE_PREF);
 }