Upstream version 5.34.97.0

[platform/framework/web/crosswalk.git] / src / xwalk / application / common / application_data.cc

diff --git a/src/xwalk/application/common/application_data.cc b/src/xwalk/application/common/application_data.cc
index d37c75f..dea676d 100644 (file)
--- a/src/xwalk/application/common/application_data.cc
+++ b/src/xwalk/application/common/application_data.cc
@@ -33,10 +33,6 @@
 #include "url/url_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(OS_TIZEN)
-#include "xwalk/tizen/appcore_context.h"
-#endif
-
 namespace keys = xwalk::application_manifest_keys;
 namespace widget_keys = xwalk::application_widget_keys;
 namespace errors = xwalk::application_manifest_errors;
@@ -254,9 +250,6 @@ bool ApplicationData::Init(base::string16* error) {
     return false;
 
   finished_parsing_manifest_ = true;
-#if defined(OS_TIZEN)
-  appcore_context_ = tizen::AppcoreContext::Create();
-#endif
   return true;
 }
 
@@ -265,7 +258,8 @@ bool ApplicationData::LoadName(base::string16* error) {
   base::string16 localized_name;
   std::string name_key(GetNameKey(GetPackageType()));
 
-  if (!manifest_->GetString(name_key, &localized_name)) {
+  if (!manifest_->GetString(name_key, &localized_name) &&
+      manifest_->IsXPKPackaged()) {
     *error = base::ASCIIToUTF16(errors::kInvalidName);
     return false;
   }
@@ -280,12 +274,14 @@ bool ApplicationData::LoadVersion(base::string16* error) {
   std::string version_str;
   std::string version_key(GetVersionKey(GetPackageType()));
 
-  if (!manifest_->GetString(version_key, &version_str)) {
+  if (!manifest_->GetString(version_key, &version_str) &&
+      manifest_->IsXPKPackaged()) {
     *error = base::ASCIIToUTF16(errors::kInvalidVersion);
     return false;
   }
   version_.reset(new base::Version(version_str));
-  if (!version_->IsValid() || version_->components().size() > 4) {
+  if (manifest_->IsXPKPackaged() &&
+      (!version_->IsValid() || version_->components().size() > 4)) {
     *error = base::ASCIIToUTF16(errors::kInvalidVersion);
     return false;
   }
@@ -295,7 +291,8 @@ bool ApplicationData::LoadVersion(base::string16* error) {
 bool ApplicationData::LoadDescription(base::string16* error) {
   DCHECK(error);
   if (manifest_->HasKey(keys::kDescriptionKey) &&
-      !manifest_->GetString(keys::kDescriptionKey, &description_)) {
+      !manifest_->GetString(keys::kDescriptionKey, &description_) &&
+      manifest_->IsXPKPackaged()) {
     *error = base::ASCIIToUTF16(errors::kInvalidDescription);
     return false;
   }
@@ -310,8 +307,10 @@ bool ApplicationData::LoadManifestVersion(base::string16* error) {
     int manifest_version = 1;
     if (!manifest_->GetInteger(keys::kManifestVersionKey, &manifest_version) ||
         manifest_version < 1) {
-      *error = base::ASCIIToUTF16(errors::kInvalidManifestVersion);
-      return false;
+      if (manifest_->IsXPKPackaged()) {
+        *error = base::ASCIIToUTF16(errors::kInvalidManifestVersion);
+        return false;
+      }
     }
   }