Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / extensions / common / extension.cc

diff --git a/src/extensions/common/extension.cc b/src/extensions/common/extension.cc
index 5339ec8..df6ea04 100644 (file)
--- a/src/extensions/common/extension.cc
+++ b/src/extensions/common/extension.cc
@@ -50,7 +50,7 @@ namespace errors = manifest_errors;
 namespace {
 
 const int kModernManifestVersion = 2;
-const int kPEMOutputColumns = 65;
+const int kPEMOutputColumns = 64;
 
 // KEY MARKERS
 const char kKeyBeginHeaderMarker[] = "-----BEGIN";
@@ -306,7 +306,8 @@ bool Extension::ShowConfigureContextMenus() const {
   // options for component extension button but now there is no component
   // extension with options. All other menu items like uninstall have
   // no sense for component extensions.
-  return location() != Manifest::COMPONENT;
+  return location() != Manifest::COMPONENT &&
+         location() != Manifest::EXTERNAL_COMPONENT;
 }
 
 bool Extension::OverlapsWithOrigin(const GURL& origin) const {
@@ -370,8 +371,7 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
 bool Extension::ShouldNotBeVisible() const {
   // Don't show component extensions because they are only extensions as an
   // implementation detail of Chrome.
-  if ((location() == Manifest::COMPONENT ||
-       location() == Manifest::EXTERNAL_COMPONENT) &&
+  if (extensions::Manifest::IsComponentLocation(location()) &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kShowComponentExtensionOptions)) {
     return true;