Upstream version 7.35.141.0

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

diff --git a/src/xwalk/application/common/manifest_handler.cc b/src/xwalk/application/common/manifest_handler.cc
index 7f9a630..7a2e32c 100644 (file)
--- a/src/xwalk/application/common/manifest_handler.cc
+++ b/src/xwalk/application/common/manifest_handler.cc
@@ -8,7 +8,6 @@
 
 #include "base/stl_util.h"
 #include "xwalk/application/common/manifest_handlers/csp_handler.h"
-#include "xwalk/application/common/manifest_handlers/main_document_handler.h"
 #if defined(OS_TIZEN)
 #include "xwalk/application/common/manifest_handlers/navigation_handler.h"
 #include "xwalk/application/common/manifest_handlers/tizen_application_handler.h"
@@ -60,8 +59,8 @@ ManifestHandlerRegistry::~ManifestHandlerRegistry() {
 }
 
 ManifestHandlerRegistry*
-ManifestHandlerRegistry::GetInstance(Manifest::PackageType package_type) {
-  if (package_type == Manifest::TYPE_WGT)
+ManifestHandlerRegistry::GetInstance(Package::Type package_type) {
+  if (package_type == Package::WGT)
     return GetInstanceForWGT();
   return GetInstanceForXPK();
 }
@@ -76,7 +75,7 @@ ManifestHandlerRegistry::GetInstanceForWGT() {
   handlers.push_back(new WidgetHandler);
   handlers.push_back(new WARPHandler);
 #if defined(OS_TIZEN)
-  handlers.push_back(new CSPHandler(Manifest::TYPE_WGT));
+  handlers.push_back(new CSPHandler(Package::WGT));
   handlers.push_back(new NavigationHandler);
   handlers.push_back(new TizenApplicationHandler);
   handlers.push_back(new TizenSettingHandler);
@@ -94,8 +93,7 @@ ManifestHandlerRegistry::GetInstanceForXPK() {
   std::vector<ManifestHandler*> handlers;
   // FIXME: Add manifest handlers here like this:
   // handlers.push_back(new xxxHandler);
-  handlers.push_back(new CSPHandler(Manifest::TYPE_XPK));
-  handlers.push_back(new MainDocumentHandler);
+  handlers.push_back(new CSPHandler(Package::XPK));
   handlers.push_back(new PermissionsHandler);
   xpk_registry_ = new ManifestHandlerRegistry(handlers);
   return xpk_registry_;
@@ -145,8 +143,8 @@ bool ManifestHandlerRegistry::ValidateAppManifest(
 
 // static
 void ManifestHandlerRegistry::SetInstanceForTesting(
-    ManifestHandlerRegistry* registry, Manifest::PackageType package_type) {
-  if (package_type == Manifest::TYPE_WGT) {
+    ManifestHandlerRegistry* registry, Package::Type package_type) {
+  if (package_type == Package::WGT) {
     widget_registry_ = registry;
     return;
   }