Update To 11.40.268.0

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

diff --git a/src/extensions/common/common_manifest_handlers.cc b/src/extensions/common/common_manifest_handlers.cc
index 9fac1bb..83ac8cc 100644 (file)
--- a/src/extensions/common/common_manifest_handlers.cc
+++ b/src/extensions/common/common_manifest_handlers.cc
@@ -4,6 +4,7 @@
 
 #include "extensions/common/common_manifest_handlers.h"
 
+#include "extensions/common/api/bluetooth/bluetooth_manifest_handler.h"
 #include "extensions/common/api/sockets/sockets_manifest_handler.h"
 #include "extensions/common/manifest_handler.h"
 #include "extensions/common/manifest_handlers/background_info.h"
@@ -15,6 +16,7 @@
 #include "extensions/common/manifest_handlers/kiosk_mode_info.h"
 #include "extensions/common/manifest_handlers/launcher_page_info.h"
 #include "extensions/common/manifest_handlers/nacl_modules_handler.h"
+#include "extensions/common/manifest_handlers/oauth2_manifest_handler.h"
 #include "extensions/common/manifest_handlers/offline_enabled_info.h"
 #include "extensions/common/manifest_handlers/sandboxed_page_info.h"
 #include "extensions/common/manifest_handlers/shared_module_info.h"
@@ -25,8 +27,8 @@ namespace extensions {
 
 void RegisterCommonManifestHandlers() {
   DCHECK(!ManifestHandler::IsRegistrationFinalized());
-#if defined(ENABLE_EXTENSIONS)
   (new BackgroundManifestHandler)->Register();
+  (new BluetoothManifestHandler)->Register();
   (new CSPHandler(false))->Register();
   (new CSPHandler(true))->Register();
   (new ExternallyConnectableHandler)->Register();
@@ -38,13 +40,13 @@ void RegisterCommonManifestHandlers() {
 #if !defined(DISABLE_NACL)
   (new NaClModulesHandler)->Register();
 #endif
+  (new OAuth2ManifestHandler)->Register();
   (new OfflineEnabledHandler)->Register();
   (new SandboxedPageHandler)->Register();
   (new SharedModuleHandler)->Register();
   (new SocketsManifestHandler)->Register();
   (new WebAccessibleResourcesHandler)->Register();
   (new WebviewHandler)->Register();
-#endif  // defined(ENABLE_EXTENSIONS)
 }
 
 }  // namespace extensions