Add more management policy checking after extension installed

chrome/browser/extensions/extension_service.cc

Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index d8e601beb50ac115f6528daf73bf231b02b4ae96..fb7ee7a067422073bc3e77208e7f018fb3e4e28a 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -1571,7 +1571,12 @@ void ExtensionService::OnExtensionInstalled(
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   const std::string& id = extension->id();
-  bool initial_enable = ShouldEnableOnInstall(extension);
+  // |new_disable_reason| contains the additional disable reason we need to
+  // add to extension prefs for extensions that supposed to be disabled
+  // initially.
+  Extension::DisableReason new_disable_reason = Extension::DISABLE_NONE;
+  bool initial_enable =
+      ShouldEnableOnInstall(extension, &new_disable_reason);
   std::string install_parameter;
   const extensions::PendingExtensionInfo* pending_extension_info =
       pending_extension_manager()->GetById(id);
@@ -1611,14 +1616,14 @@ void ExtensionService::OnExtensionInstalled(
   // Unsupported requirements overrides the management policy.
   if (install_flags & extensions::kInstallFlagHasRequirementErrors) {
     initial_enable = false;
-    extension_prefs_->AddDisableReason(
-        id, Extension::DISABLE_UNSUPPORTED_REQUIREMENT);
+    new_disable_reason = Extension::DISABLE_UNSUPPORTED_REQUIREMENT;
   // If the extension was disabled because of unsupported requirements but
   // now supports all requirements after an update and there are not other
   // disable reasons, enable it.
   } else if (extension_prefs_->GetDisableReasons(id) ==
       Extension::DISABLE_UNSUPPORTED_REQUIREMENT) {
     initial_enable = true;
+    new_disable_reason = Extension::DISABLE_NONE;
     extension_prefs_->ClearDisableReasons(id);
   }
 
@@ -1654,6 +1659,9 @@ void ExtensionService::OnExtensionInstalled(
     }
   }
 
+  if (!initial_enable)
+    extension_prefs_->AddDisableReason(id, new_disable_reason);
+
   const Extension::State initial_state =
       initial_enable ? Extension::ENABLED : Extension::DISABLED;
   if (ShouldDelayExtensionUpdate(
@@ -2152,14 +2160,25 @@ void ExtensionService::Observe(int type,
   }
 }
 
-bool ExtensionService::ShouldEnableOnInstall(const Extension* extension) {
+bool ExtensionService::ShouldEnableOnInstall(
+    const Extension* extension,
+    Extension::DisableReason* disable_reason) {
+  // Extensions disabled by managemeny policy should always be disabled, even

[not at google - send to devlin, 2014/11/12 18:02:15]

management

[binjin, 2014/11/12 18:39:01]

Done.

+  // if it's force-installed.
+  if (system_->management_policy()->MustRemainDisabled(
+          extension, disable_reason, nullptr)) {
+    return false;
+  }
+
   // Extensions installed by policy can't be disabled. So even if a previous
   // installation disabled the extension, make sure it is now enabled.
-  if (system_->management_policy()->MustRemainEnabled(extension, NULL))
+  if (system_->management_policy()->MustRemainEnabled(extension, nullptr))
     return true;
 
-  if (extension_prefs_->IsExtensionDisabled(extension->id()))
+  if (extension_prefs_->IsExtensionDisabled(extension->id())) {
+    *disable_reason = Extension::DISABLE_NONE;
     return false;
+  }
 
   if (FeatureSwitch::prompt_for_external_extensions()->IsEnabled()) {
     // External extensions are initially disabled. We prompt the user before
@@ -2168,6 +2187,7 @@ bool ExtensionService::ShouldEnableOnInstall(const Extension* extension) {
     if (extension->GetType() != Manifest::TYPE_HOSTED_APP &&
         Manifest::IsExternalLocation(extension->location()) &&
         !extension_prefs_->IsExternalExtensionAcknowledged(extension->id())) {
+      *disable_reason = Extension::DISABLE_NONE;
       return false;
     }
   }