OBSOLETE REVIEW. See http://codereview.chromium.org/10382149/

chrome/browser/extensions/extension_management_api.cc

Index: chrome/browser/extensions/extension_management_api.cc
===================================================================
--- chrome/browser/extensions/extension_management_api.cc	(revision 136836)
+++ chrome/browser/extensions/extension_management_api.cc	(working copy)
@@ -58,6 +58,9 @@
   bool enabled = service->IsExtensionEnabled(extension.id());
   extension.GetBasicInfo(enabled, info);
 
+  info->SetBoolean(keys::kMayDisableKey, service->

[Aaron Boodman, 2012/05/17 22:41:06]

What's the need for this?

[Aaron Boodman, 2012/05/17 22:41:06]

Wrapping: param lines should all start at same column. Also, it's weird looking
to wrap after the arrow.

[Pam (message me for reviews), 2012/05/18 20:15:15]

It's part of the ExtensionInfo returned by the API. It was originally set here,
then it moved into GetBasicInfo(), and now it has to move back out since the
extension doesn't know about the ManagementPolicy.

+      extension_management_policy()->UserMayModifyStatus(&extension, NULL));
+
   info->SetBoolean(keys::kIsAppKey, extension.is_app());
 
   if (!enabled) {
@@ -365,9 +368,15 @@
     return false;
   }
 
-  if (!Extension::UserMayDisable(extension->location())) {
-    error_ = ExtensionErrorUtils::FormatErrorMessage(
-        keys::kUserCantDisableError, extension_id_);
+  if (!service()->extension_management_policy()->
+      UserMayModifyStatus(extension, NULL)) {
+    if (enable) {
+      error_ = ExtensionErrorUtils::FormatErrorMessage(
+          keys::kUserCantModifyError, extension_id_);

[Aaron Boodman, 2012/05/17 22:41:06]

Can we just have a generic kUserCantDoAnything error? The string values aren't
part of our API contract, it's OK to change them.

[Pam (message me for reviews), 2012/05/18 20:15:15]

Excellent, I'd love to consolidate them.

+    } else {
+      error_ = ExtensionErrorUtils::FormatErrorMessage(
+          keys::kUserCantDisableError, extension_id_);
+    }
     return false;
   }
 
@@ -420,10 +429,9 @@
     return false;
   }
 
-  ExtensionPrefs* prefs = service()->extension_prefs();
-
-  if (!Extension::UserMayDisable(
-      prefs->GetInstalledExtensionInfo(extension_id)->extension_location)) {
+  const Extension* extension = service()->GetExtensionById(extension_id, true);
+  if (!service()->extension_management_policy()->
+      UserMayModifyStatus(extension, NULL)) {

[Aaron Boodman, 2012/05/17 22:41:06]

Wrap at open paren. You should also change extension_management_policy ->
management_policy, which will help here.

     error_ = ExtensionErrorUtils::FormatErrorMessage(
         keys::kUserCantDisableError, extension_id);
     return false;