Upstream version 10.38.222.0

[platform/framework/web/crosswalk.git] / src / extensions / browser / admin_policy.cc

diff --git a/src/extensions/browser/admin_policy.cc b/src/extensions/browser/admin_policy.cc
index d961da1..5213db6 100644 (file)
--- a/src/extensions/browser/admin_policy.cc
+++ b/src/extensions/browser/admin_policy.cc
@@ -7,7 +7,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
-#include "grit/generated_resources.h"
+#include "grit/extensions_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
@@ -16,7 +16,7 @@ bool ManagementPolicyImpl(const extensions::Extension* extension,
                           base::string16* error,
                           bool modifiable_value) {
   bool modifiable =
-      extension->location() != extensions::Manifest::COMPONENT &&
+      !extensions::Manifest::IsComponentLocation(extension->location()) &&
       !extensions::Manifest::IsPolicyLocation(extension->location());
   // Some callers equate "no restriction" to true, others to false.
   if (modifiable)
@@ -88,12 +88,15 @@ bool UserMayLoad(const base::ListValue* blacklist,
     case Manifest::TYPE_HOSTED_APP:
     case Manifest::TYPE_LEGACY_PACKAGED_APP:
     case Manifest::TYPE_PLATFORM_APP:
-    case Manifest::TYPE_SHARED_MODULE:
+    case Manifest::TYPE_SHARED_MODULE: {
       base::FundamentalValue type_value(extension->GetType());
       if (allowed_types &&
           allowed_types->Find(type_value) == allowed_types->end())
         return ReturnLoadError(extension, error);
       break;
+    }
+    case Manifest::NUM_LOAD_TYPES:
+      NOTREACHED();
   }
 
   // Check the whitelist/forcelist first.