[WRTjs] Move xwalk_extenions to tizen_src

XWalkExtension will be common component for EWK based runtime, not
only WRT.

This work proceeds in the following steps:
 1) Remove WRT dependency and apply delegations
    https://review.tizen.org/gerrit/287731/
 2) Move files to tizen_src and build integration <--- current
 3) Binding XWalkExtension for Efl classes
 4) Introduce interfaces to enable XWalkExtensions

Change-Id: I4536a667bae58b5977ff86a6097f93214748b4e2
Signed-off-by: DongHyun Song <dh81.song@samsung.com>

diff --git a/content/browser/browser_interface_binders.cc b/content/browser/browser_interface_binders.cc
index 78006de..1d3cc71 100644 (file)
--- a/content/browser/browser_interface_binders.cc
+++ b/content/browser/browser_interface_binders.cc
@@ -211,7 +211,7 @@
 #endif
 
 #if defined(ENABLE_WRT_JS)
-#include "wrt/xwalk_extensions/browser/xwalk_extension_manager.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h"
 #endif
 
 namespace blink {

diff --git a/tizen_src/chromium_impl/components/components.gni b/tizen_src/chromium_impl/components/components.gni
index 643a369..fcb7852 100644 (file)
--- a/tizen_src/chromium_impl/components/components.gni
+++ b/tizen_src/chromium_impl/components/components.gni
@@ -11,4 +11,26 @@ js_dialog_efl_deps = [ "//tizen_src/chromium_impl/components/js_dialogs_efl" ]
 external_display_embedder_sources = [
   "//tizen_src/chromium_impl/components/viz/service/display_embedder/skia_output_device_offscreen_tbm.cc",
   "//tizen_src/chromium_impl/components/viz/service/display_embedder/skia_output_device_offscreen_tbm.h",
+]
+
+xwalk_extensions_sources = [
+  "//tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension.cc",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension.h",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.cc",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/common/xwalk_extension_browser_delegate.h",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/object_tools_module.cc",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/object_tools_module.h",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/v8_tools_module.cc",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/v8_tools_module.h",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/widget_module.cc",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/widget_module.h",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_context_data.cc",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_context_data.h",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_module.cc",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_module.h",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.cc",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_trampoline.cc",
+  "//tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_trampoline.h",
 ]
\ No newline at end of file

diff --git a/wrt/xwalk_extensions/BUILD.gn b/tizen_src/chromium_impl/components/xwalk_extensions/BUILD.gn
old mode 100755 (executable)
new mode 100644 (file)
similarity index 75%
rename from wrt/xwalk_extensions/BUILD.gn
rename to tizen_src/chromium_impl/components/xwalk_extensions/BUILD.gn
index db0756b..68b74de
--- a/wrt/xwalk_extensions/BUILD.gn
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/BUILD.gn
@@ -1,3 +1,33 @@
+import("//mojo/public/tools/bindings/mojom.gni")
+
+declare_args() {
+  xwalk_extension_path = ""
+  xwalk_extension_service_path = ""
+}
+
+config("xwalk_extension_config") {
+  defines = [
+    "XWALK_EXTENSION_PATH=\"$xwalk_extension_path\"",
+    "XWALK_EXTENSION_SERVICE_PATH=\"$xwalk_extension_service_path\"",
+  ]
+}
+
+config("xwalk_extension_service_config") {
+  ldflags = [
+    "-Wl,-rpath=$xwalk_extension_path",
+  ]
+}
+
+mojom("mojo_bindings") {
+  cpp_only = true
+  sources = [
+    "common/xwalk_extension.mojom",
+  ]
+  public_deps = [
+    "//mojo/public/mojom/base",
+  ]
+}
+
 template("xwalk_extension_library") {
   assert(defined(invoker.native_files), "Need native_files arguments")
   assert(defined(invoker.js_file), "Need js_file argumets")

diff --git a/wrt/xwalk_extensions/browser/xwalk_extension.cc b/tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension.cc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 96%
rename from wrt/xwalk_extensions/browser/xwalk_extension.cc
rename to tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension.cc
index 86ebc5f..1c0608a
--- a/wrt/xwalk_extensions/browser/xwalk_extension.cc
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension.cc
@@ -3,17 +3,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "wrt/xwalk_extensions/browser/xwalk_extension.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension.h"
 
 #include <dlfcn.h>
 #include <string>
 
 #include "base/logging.h"
 #include "base/synchronization/lock.h"
-#include "wrt/xwalk_extensions/browser/xwalk_extension_manager.h"
-#include "wrt/xwalk_extensions/public/XW_Extension_EntryPoints.h"
-#include "wrt/xwalk_extensions/public/XW_Extension_Permissions.h"
-#include "wrt/xwalk_extensions/public/XW_Extension_Runtime.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension_EntryPoints.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension_Permissions.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension_Runtime.h"
 
 namespace wrt {
 

diff --git a/wrt/xwalk_extensions/browser/xwalk_extension.h b/tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 92%
rename from wrt/xwalk_extensions/browser/xwalk_extension.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension.h
index 459c284..f88cc91
--- a/wrt/xwalk_extensions/browser/xwalk_extension.h
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension.h
@@ -10,9 +10,9 @@
 #include <string>
 #include <vector>
 
-#include "wrt/xwalk_extensions/public/XW_Extension.h"
-#include "wrt/xwalk_extensions/public/XW_Extension_SyncMessage.h"
-#include "wrt/xwalk_extensions/public/XW_Extension_Message_2.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension_SyncMessage.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension_Message_2.h"
 
 namespace wrt {
 

diff --git a/wrt/xwalk_extensions/browser/xwalk_extension_manager.cc b/tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.cc
similarity index 98%
rename from wrt/xwalk_extensions/browser/xwalk_extension_manager.cc
rename to tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.cc
index 5e8ff2a..1af1fa1 100644 (file)
--- a/wrt/xwalk_extensions/browser/xwalk_extension_manager.cc
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "wrt/xwalk_extensions/browser/xwalk_extension_manager.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h"
 
 #include <dlfcn.h>
 #include <glob.h>
@@ -14,7 +14,7 @@
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/navigation_entry.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
-#include "wrt/xwalk_extensions/browser/xwalk_extension.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension.h"
 
 #ifndef XWALK_EXTENSION_PATH
   #error XWALK_EXTENSION_PATH is not set.

diff --git a/wrt/xwalk_extensions/browser/xwalk_extension_manager.h b/tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h
similarity index 94%
rename from wrt/xwalk_extensions/browser/xwalk_extension_manager.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h
index c877915..b37fd42 100644 (file)
--- a/wrt/xwalk_extensions/browser/xwalk_extension_manager.h
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h
@@ -14,9 +14,9 @@
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
 #include "mojo/public/cpp/bindings/remote.h"
-#include "wrt/xwalk_extensions/browser/xwalk_extension.h"
-#include "wrt/xwalk_extensions/common/xwalk_extension_browser_delegate.h"
-#include "wrt/xwalk_extensions/common/xwalk_extension.mojom.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/common/xwalk_extension_browser_delegate.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/common/xwalk_extension.mojom.h"
 
 namespace content {
 class WebContents;

diff --git a/wrt/xwalk_extensions/common/xwalk_extension.mojom b/tizen_src/chromium_impl/components/xwalk_extensions/common/xwalk_extension.mojom
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/common/xwalk_extension.mojom
rename to tizen_src/chromium_impl/components/xwalk_extensions/common/xwalk_extension.mojom

diff --git a/wrt/xwalk_extensions/common/xwalk_extension_browser_delegate.h b/tizen_src/chromium_impl/components/xwalk_extensions/common/xwalk_extension_browser_delegate.h
similarity index 100%
rename from wrt/xwalk_extensions/common/xwalk_extension_browser_delegate.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/common/xwalk_extension_browser_delegate.h

diff --git a/wrt/xwalk_extensions/internal/offload_js/offload_js.json b/tizen_src/chromium_impl/components/xwalk_extensions/internal/offload_js/offload_js.json
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/internal/offload_js/offload_js.json
rename to tizen_src/chromium_impl/components/xwalk_extensions/internal/offload_js/offload_js.json

diff --git a/wrt/xwalk_extensions/internal/offload_js/offload_js_api.js b/tizen_src/chromium_impl/components/xwalk_extensions/internal/offload_js/offload_js_api.js
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/internal/offload_js/offload_js_api.js
rename to tizen_src/chromium_impl/components/xwalk_extensions/internal/offload_js/offload_js_api.js

diff --git a/wrt/xwalk_extensions/internal/offload_js/offload_js_extension.cc b/tizen_src/chromium_impl/components/xwalk_extensions/internal/offload_js/offload_js_extension.cc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/internal/offload_js/offload_js_extension.cc
rename to tizen_src/chromium_impl/components/xwalk_extensions/internal/offload_js/offload_js_extension.cc

diff --git a/wrt/xwalk_extensions/internal/splash_screen/splash_screen.json b/tizen_src/chromium_impl/components/xwalk_extensions/internal/splash_screen/splash_screen.json
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/internal/splash_screen/splash_screen.json
rename to tizen_src/chromium_impl/components/xwalk_extensions/internal/splash_screen/splash_screen.json

diff --git a/wrt/xwalk_extensions/internal/splash_screen/splash_screen_api.js b/tizen_src/chromium_impl/components/xwalk_extensions/internal/splash_screen/splash_screen_api.js
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/internal/splash_screen/splash_screen_api.js
rename to tizen_src/chromium_impl/components/xwalk_extensions/internal/splash_screen/splash_screen_api.js

diff --git a/wrt/xwalk_extensions/internal/splash_screen/splash_screen_extension.cc b/tizen_src/chromium_impl/components/xwalk_extensions/internal/splash_screen/splash_screen_extension.cc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/internal/splash_screen/splash_screen_extension.cc
rename to tizen_src/chromium_impl/components/xwalk_extensions/internal/splash_screen/splash_screen_extension.cc

diff --git a/wrt/xwalk_extensions/internal/widget/widget.json b/tizen_src/chromium_impl/components/xwalk_extensions/internal/widget/widget.json
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/internal/widget/widget.json
rename to tizen_src/chromium_impl/components/xwalk_extensions/internal/widget/widget.json

diff --git a/wrt/xwalk_extensions/internal/widget/widget_api.js b/tizen_src/chromium_impl/components/xwalk_extensions/internal/widget/widget_api.js
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/internal/widget/widget_api.js
rename to tizen_src/chromium_impl/components/xwalk_extensions/internal/widget/widget_api.js

diff --git a/wrt/xwalk_extensions/internal/widget/widget_extension.cc b/tizen_src/chromium_impl/components/xwalk_extensions/internal/widget/widget_extension.cc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/internal/widget/widget_extension.cc
rename to tizen_src/chromium_impl/components/xwalk_extensions/internal/widget/widget_extension.cc

diff --git a/wrt/xwalk_extensions/public/XW_Extension.h b/tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/public/XW_Extension.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension.h

diff --git a/wrt/xwalk_extensions/public/XW_Extension_EntryPoints.h b/tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension_EntryPoints.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/public/XW_Extension_EntryPoints.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension_EntryPoints.h

diff --git a/wrt/xwalk_extensions/public/XW_Extension_Message_2.h b/tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension_Message_2.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/public/XW_Extension_Message_2.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension_Message_2.h

diff --git a/wrt/xwalk_extensions/public/XW_Extension_Permissions.h b/tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension_Permissions.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/public/XW_Extension_Permissions.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension_Permissions.h

diff --git a/wrt/xwalk_extensions/public/XW_Extension_Runtime.h b/tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension_Runtime.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/public/XW_Extension_Runtime.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension_Runtime.h

diff --git a/wrt/xwalk_extensions/public/XW_Extension_SyncMessage.h b/tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension_SyncMessage.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/public/XW_Extension_SyncMessage.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/public/XW_Extension_SyncMessage.h

diff --git a/wrt/xwalk_extensions/renderer/native_module/object_tools_module.cc b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/object_tools_module.cc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 97%
rename from wrt/xwalk_extensions/renderer/native_module/object_tools_module.cc
rename to tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/object_tools_module.cc
index 3247af0..639078c
--- a/wrt/xwalk_extensions/renderer/native_module/object_tools_module.cc
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/object_tools_module.cc
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-#include "wrt/xwalk_extensions/renderer/native_module/object_tools_module.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/object_tools_module.h"
 
 #include <string>
 

diff --git a/wrt/xwalk_extensions/renderer/native_module/object_tools_module.h b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/object_tools_module.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 91%
rename from wrt/xwalk_extensions/renderer/native_module/object_tools_module.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/object_tools_module.h
index 9a10bd2..fe8f8e8
--- a/wrt/xwalk_extensions/renderer/native_module/object_tools_module.h
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/object_tools_module.h
@@ -17,7 +17,7 @@
 #ifndef XWALK_EXTENSIONS_RENDERER_NATIVE_MODULE_OBJECT_TOOLS_MODULE_H_
 #define XWALK_EXTENSIONS_RENDERER_NATIVE_MODULE_OBJECT_TOOLS_MODULE_H_
 
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_context_data.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_context_data.h"
 
 namespace wrt {
 

diff --git a/wrt/xwalk_extensions/renderer/native_module/v8_tools_module.cc b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/v8_tools_module.cc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 97%
rename from wrt/xwalk_extensions/renderer/native_module/v8_tools_module.cc
rename to tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/v8_tools_module.cc
index d29fea9..882dde9
--- a/wrt/xwalk_extensions/renderer/native_module/v8_tools_module.cc
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/v8_tools_module.cc
@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "wrt/xwalk_extensions/renderer/native_module/v8_tools_module.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/v8_tools_module.h"
 
 #include "base/logging.h"
 #include "v8/include/v8.h"

diff --git a/wrt/xwalk_extensions/renderer/native_module/v8_tools_module.h b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/v8_tools_module.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 89%
rename from wrt/xwalk_extensions/renderer/native_module/v8_tools_module.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/v8_tools_module.h
index b13547d..5835735
--- a/wrt/xwalk_extensions/renderer/native_module/v8_tools_module.h
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/v8_tools_module.h
@@ -6,7 +6,7 @@
 #ifndef XWALK_EXTENSIONS_RENDERER_NATIVE_MODULE_V8_TOOLS_MODULE_H_
 #define XWALK_EXTENSIONS_RENDERER_NATIVE_MODULE_V8_TOOLS_MODULE_H_
 
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_context_data.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_context_data.h"
 
 namespace wrt {
 

diff --git a/wrt/xwalk_extensions/renderer/native_module/widget_module.cc b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/widget_module.cc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from wrt/xwalk_extensions/renderer/native_module/widget_module.cc
rename to tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/widget_module.cc
index f8e1012..e5a6c03
--- a/wrt/xwalk_extensions/renderer/native_module/widget_module.cc
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/widget_module.cc
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-#include "wrt/xwalk_extensions/renderer/native_module/widget_module.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/widget_module.h"
 
 #include <algorithm>
 #include <vector>

diff --git a/wrt/xwalk_extensions/renderer/native_module/widget_module.h b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/widget_module.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 91%
rename from wrt/xwalk_extensions/renderer/native_module/widget_module.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/widget_module.h
index 129e6e8..fb09327
--- a/wrt/xwalk_extensions/renderer/native_module/widget_module.h
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/widget_module.h
@@ -17,7 +17,7 @@
 #ifndef XWALK_EXTENSIONS_RENDERER_NATIVE_MODULE_WIDGET_MODULE_H_
 #define XWALK_EXTENSIONS_RENDERER_NATIVE_MODULE_WIDGET_MODULE_H_
 
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_context_data.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_context_data.h"
 
 namespace wrt {
 

diff --git a/wrt/xwalk_extensions/renderer/xwalk_extension_context_data.cc b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_context_data.cc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 93%
rename from wrt/xwalk_extensions/renderer/xwalk_extension_context_data.cc
rename to tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_context_data.cc
index 000ed81..c1f85db
--- a/wrt/xwalk_extensions/renderer/xwalk_extension_context_data.cc
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_context_data.cc
@@ -3,16 +3,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_context_data.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_context_data.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/strings/string_split.h"
-#include "wrt/src/base/profiler.h"
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_module.h"
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h"
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_trampoline.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_module.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_trampoline.h"
 
 namespace wrt {
 
@@ -129,8 +128,6 @@ void XWalkExtensionContextData::RegisterNativeModule(
 }
 
 bool XWalkExtensionContextData::Initialize(v8::Local<v8::Context> context) {
-  SCOPE_PROFILE();
-
   v8::Isolate* isolate = context->GetIsolate();
   v8::HandleScope handle_scope(isolate);
   v8::Context::Scope context_scope(context);

diff --git a/wrt/xwalk_extensions/renderer/xwalk_extension_context_data.h b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_context_data.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/renderer/xwalk_extension_context_data.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_context_data.h

diff --git a/wrt/xwalk_extensions/renderer/xwalk_extension_module.cc b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_module.cc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 98%
rename from wrt/xwalk_extensions/renderer/xwalk_extension_module.cc
rename to tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_module.cc
index 965f053..885ce62
--- a/wrt/xwalk_extensions/renderer/xwalk_extension_module.cc
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_module.cc
@@ -4,11 +4,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_module.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_module.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_context_data.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_context_data.h"
 
 namespace wrt {
 

diff --git a/wrt/xwalk_extensions/renderer/xwalk_extension_module.h b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_module.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 96%
rename from wrt/xwalk_extensions/renderer/xwalk_extension_module.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_module.h
index 4706bec..8c4e46d
--- a/wrt/xwalk_extensions/renderer/xwalk_extension_module.h
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_module.h
@@ -11,7 +11,7 @@
 #include <string>
 
 #include "v8/include/v8.h"
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h"
 
 namespace wrt {
 

diff --git a/wrt/xwalk_extensions/renderer/xwalk_extension_renderer_controller.cc b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.cc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 94%
rename from wrt/xwalk_extensions/renderer/xwalk_extension_renderer_controller.cc
rename to tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.cc
index 51c1feb..71ac916
--- a/wrt/xwalk_extensions/renderer/xwalk_extension_renderer_controller.cc
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.cc
@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h"
 
 #include "base/logging.h"
 #include "base/no_destructor.h"
@@ -14,11 +14,11 @@
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "third_party/blink/public/web/web_document.h"
 #include "third_party/blink/renderer/core/workers/worker_global_scope.h"
-#include "wrt/xwalk_extensions/renderer/native_module/object_tools_module.h"
-#include "wrt/xwalk_extensions/renderer/native_module/v8_tools_module.h"
-#include "wrt/xwalk_extensions/renderer/native_module/widget_module.h"
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_context_data.h"
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_module.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/object_tools_module.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/v8_tools_module.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/native_module/widget_module.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_context_data.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_module.h"
 
 namespace wrt {
 

diff --git a/wrt/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 97%
rename from wrt/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h
index 9e3d847..3215adb
--- a/wrt/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h
@@ -14,7 +14,7 @@
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "v8/include/v8.h"
-#include "wrt/xwalk_extensions/common/xwalk_extension.mojom.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/common/xwalk_extension.mojom.h"
 
 namespace blink {
 class ExecutionContext;

diff --git a/wrt/xwalk_extensions/renderer/xwalk_extension_trampoline.cc b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_trampoline.cc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 94%
rename from wrt/xwalk_extensions/renderer/xwalk_extension_trampoline.cc
rename to tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_trampoline.cc
index 29cf463..e4247ed
--- a/wrt/xwalk_extensions/renderer/xwalk_extension_trampoline.cc
+++ b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_trampoline.cc
@@ -1,10 +1,10 @@
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_trampoline.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_trampoline.h"
 
 #include "base/logging.h"
 #include "base/strings/string_split.h"
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_context_data.h"
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_module.h"
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_context_data.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_module.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h"
 
 namespace wrt {
 

diff --git a/wrt/xwalk_extensions/renderer/xwalk_extension_trampoline.h b/tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_trampoline.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/renderer/xwalk_extension_trampoline.h
rename to tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_trampoline.h

diff --git a/wrt/xwalk_extensions/tools/generate_api.py b/tizen_src/chromium_impl/components/xwalk_extensions/tools/generate_api.py
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/tools/generate_api.py
rename to tizen_src/chromium_impl/components/xwalk_extensions/tools/generate_api.py

diff --git a/wrt/xwalk_extensions/tools/mergejs.py b/tizen_src/chromium_impl/components/xwalk_extensions/tools/mergejs.py
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wrt/xwalk_extensions/tools/mergejs.py
rename to tizen_src/chromium_impl/components/xwalk_extensions/tools/mergejs.py

diff --git a/wrt/BUILD.gn b/wrt/BUILD.gn
index 933e47f..d9fb359 100755 (executable)
--- a/wrt/BUILD.gn
+++ b/wrt/BUILD.gn
@@ -7,6 +7,7 @@ import("//electron/filenames.gni")
 import("//extensions/buildflags/buildflags.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//ppapi/buildflags/buildflags.gni")
+import("//tizen_src/chromium_impl/components/components.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/grit/repack.gni")
 import("build/wrt.gni")
@@ -15,8 +16,6 @@ import("filenames.gni")
 electron_version = "22.0.0"
 
 declare_args() {
-  xwalk_extension_path = ""
-  xwalk_extension_service_path = ""
   if (tizen_product_tv) {
     lib_dir_path = ""
   }
@@ -248,7 +247,6 @@ mojom("mojo_bindings") {
   cpp_only = true
   sources = [
     "src/common/wrt.mojom",
-    "xwalk_extensions/common/xwalk_extension.mojom",
   ]
   public_deps = [
     "//mojo/public/mojom/base",
@@ -358,6 +356,7 @@ static_library("wrt_lib") {
     "//services/proxy_resolver:lib",
     "//third_party/electron_node:node_lib",
     "//third_party/webrtc_overrides:webrtc_component",
+    "//tizen_src/chromium_impl/components/xwalk_extensions:mojo_bindings",
   ]
 
   public_deps = [
@@ -368,9 +367,9 @@ static_library("wrt_lib") {
   ]
 
   data_deps = [
-    "xwalk_extensions:offload_js_plugin",
-    "xwalk_extensions:splash_screen_plugin",
-    "xwalk_extensions:widget_plugin",
+    "//tizen_src/chromium_impl/components/xwalk_extensions:offload_js_plugin",
+    "//tizen_src/chromium_impl/components/xwalk_extensions:splash_screen_plugin",
+    "//tizen_src/chromium_impl/components/xwalk_extensions:widget_plugin",
   ]
 
   configs += [
@@ -379,6 +378,7 @@ static_library("wrt_lib") {
     "//third_party/jsoncpp:jsoncpp_config",
     "//third_party/leveldatabase:leveldb_config",
     "//third_party/protobuf:protobuf_config",
+    "//tizen_src/chromium_impl/components/xwalk_extensions:xwalk_extension_config",
     "//v8:external_startup_data",
   ]
   public_configs = [ ":wrt_config" ]
@@ -395,8 +395,6 @@ static_library("wrt_lib") {
   defines = [
     "ELECTRON_PRODUCT_NAME=\"WRT\"",
     "ELECTRON_PROJECT_NAME=\"WRT\"",
-    "XWALK_EXTENSION_PATH=\"$xwalk_extension_path\"",
-    "XWALK_EXTENSION_SERVICE_PATH=\"$xwalk_extension_service_path\"",
     "ENABLE_CHROME_EXTENSIONS=$enable_chrome_extensions",
   ]
   if (tizen_product_tv) {
@@ -467,6 +465,7 @@ static_library("wrt_lib") {
   }
   sources += wrt_lib_sources_mde
   sources += get_target_outputs(":electron_fuses")
+  sources += xwalk_extensions_sources
 
   if (enable_plugins) {
     sources += [
@@ -616,9 +615,6 @@ executable("wrt-service") {
     ":wrt-service-override",
     "//tizen_src/ewk/efl_integration:libchromium-ewk"
   ]
-  ldflags = [
-    "-Wl,-rpath=$xwalk_extension_path",
-  ]
   sources = [
     "src/app/service_main.cc",
     "src/browser/wrt_ipc.cc",
@@ -629,7 +625,8 @@ executable("wrt-service") {
       "//tizen_src/build:appcore-agent",
       "//tizen_src/build:dbus-1",
       "//tizen_src/build:dlog",
-      "//tizen_src/build/config/tizen:executable_config"
+      "//tizen_src/build/config/tizen:executable_config",
+      "//tizen_src/chromium_impl/components/xwalk_extensions:xwalk_extension_service_config",
     ]
   }
 }

diff --git a/wrt/filenames.gni b/wrt/filenames.gni
index ec189da..716a8e2 100755 (executable)
--- a/wrt/filenames.gni
+++ b/wrt/filenames.gni
@@ -145,25 +145,6 @@ wrt_lib_sources = [
   "src/service/wrt_service_launcher.h",
   "src/service/wrt_service_manager.cc",
   "src/service/wrt_service_manager.h",
-  "xwalk_extensions/browser/xwalk_extension.cc",
-  "xwalk_extensions/browser/xwalk_extension.h",
-  "xwalk_extensions/browser/xwalk_extension_manager.cc",
-  "xwalk_extensions/browser/xwalk_extension_manager.h",
-  "xwalk_extensions/common/xwalk_extension_browser_delegate.h",
-  "xwalk_extensions/renderer/native_module/object_tools_module.cc",
-  "xwalk_extensions/renderer/native_module/object_tools_module.h",
-  "xwalk_extensions/renderer/native_module/v8_tools_module.cc",
-  "xwalk_extensions/renderer/native_module/v8_tools_module.h",
-  "xwalk_extensions/renderer/native_module/widget_module.cc",
-  "xwalk_extensions/renderer/native_module/widget_module.h",
-  "xwalk_extensions/renderer/xwalk_extension_context_data.cc",
-  "xwalk_extensions/renderer/xwalk_extension_context_data.h",
-  "xwalk_extensions/renderer/xwalk_extension_module.cc",
-  "xwalk_extensions/renderer/xwalk_extension_module.h",
-  "xwalk_extensions/renderer/xwalk_extension_renderer_controller.cc",
-  "xwalk_extensions/renderer/xwalk_extension_renderer_controller.h",
-  "xwalk_extensions/renderer/xwalk_extension_trampoline.cc",
-  "xwalk_extensions/renderer/xwalk_extension_trampoline.h",
 ]
 
 wrt_lib_sources_mde = [

diff --git a/wrt/src/app/tv/wrt_main_delegate_tv.cc b/wrt/src/app/tv/wrt_main_delegate_tv.cc
index e5e6042..34dddf9 100644 (file)
--- a/wrt/src/app/tv/wrt_main_delegate_tv.cc
+++ b/wrt/src/app/tv/wrt_main_delegate_tv.cc
@@ -15,6 +15,8 @@
 #include "base/threading/thread_id_name_manager.h"
 #include "content/common/zygote/zygote_communication_linux.h"
 #include "content/public/common/zygote/zygote_handle.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h"
+#include "tizen_src/chromium_impl/ui/gl/gl_shared_context_efl.h"
 #include "wrt/src/base/platform_info.h"
 #include "wrt/src/browser/net/tv/encrypted_file_url_loader.h"
 #include "wrt/src/browser/tv/input_device_manager.h"
@@ -28,8 +30,6 @@
 #include "wrt/src/common/locale_manager.h"
 #include "wrt/src/common/tv/application_data_tv.h"
 #include "wrt/src/renderer/tv/wrt_renderer_client_tv.h"
-#include "wrt/xwalk_extensions/browser/xwalk_extension_manager.h"
-#include "tizen_src/chromium_impl/ui/gl/gl_shared_context_efl.h"
 
 #if TIZEN_VERSION_AT_LEAST(7, 0, 0)
 #include <aul_proc_group.h>

diff --git a/wrt/src/app/wrt_main_delegate.cc b/wrt/src/app/wrt_main_delegate.cc
index b8a6324..4a4268c 100755 (executable)
--- a/wrt/src/app/wrt_main_delegate.cc
+++ b/wrt/src/app/wrt_main_delegate.cc
@@ -8,6 +8,7 @@
 #include "electron/shell/common/electron_paths.h"
 #include "electron/shell/common/options_switches.h"
 #include "sandbox/policy/switches.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h"
 #if !defined(WRT_JS_BRINGUP)
 #include "tizen_src/chromium_impl/content/common/locale_efl.h"
 #endif
@@ -24,7 +25,6 @@
 #include "wrt/src/common/constants.h"
 #include "wrt/src/common/wrt_content_client.h"
 #include "wrt/src/renderer/wrt_renderer_client.h"
-#include "wrt/xwalk_extensions/browser/xwalk_extension_manager.h"
 
 #if BUILDFLAG(ENABLE_NACL)
 #include "components/nacl/common/nacl_paths.h"

diff --git a/wrt/src/browser/api/wrt_api_xwalk_extension.cc b/wrt/src/browser/api/wrt_api_xwalk_extension.cc
index 99d7669..fd61369 100755 (executable)
--- a/wrt/src/browser/api/wrt_api_xwalk_extension.cc
+++ b/wrt/src/browser/api/wrt_api_xwalk_extension.cc
@@ -21,8 +21,8 @@
 #include "electron/shell/common/node_includes.h"
 #include "gin/dictionary.h"
 #include "gin/object_template_builder.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h"
 #include "wrt/src/common/application_data.h"
-#include "wrt/xwalk_extensions/browser/xwalk_extension_manager.h"
 
 namespace wrt {
 

diff --git a/wrt/src/browser/api/wrt_api_xwalk_extension.h b/wrt/src/browser/api/wrt_api_xwalk_extension.h
index 1183bfe..5f3ae20 100755 (executable)
--- a/wrt/src/browser/api/wrt_api_xwalk_extension.h
+++ b/wrt/src/browser/api/wrt_api_xwalk_extension.h
@@ -7,8 +7,8 @@
 
 #include "gin/arguments.h"
 #include "gin/wrappable.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension.h"
 #include "wrt/src/common/api/wrt_api_base_object.h"
-#include "wrt/xwalk_extensions/browser/xwalk_extension.h"
 
 namespace wrt {
 

diff --git a/wrt/src/browser/native_web_runtime.cc b/wrt/src/browser/native_web_runtime.cc
index 178c9eb..52f9417 100755 (executable)
--- a/wrt/src/browser/native_web_runtime.cc
+++ b/wrt/src/browser/native_web_runtime.cc
@@ -14,6 +14,7 @@
 #include "electron/shell/browser/window_list.h"
 #include "electron/shell/common/electron_paths.h"
 #include "extensions/buildflags/buildflags.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h"
 #include "tizen_src/chromium_impl/efl/window_factory.h"
 #include "tizen_src/ewk/efl_integration/browser/tizen_extensible_host.h"
 #include "tizen_src/ewk/efl_integration/common/content_switches_efl.h"
@@ -36,7 +37,6 @@
 #include "wrt/src/common/privilege.h"
 #include "wrt/src/common/resource_manager.h"
 #include "wrt/src/common/wrt_profile_delegate.h"
-#include "wrt/xwalk_extensions/browser/xwalk_extension_manager.h"
 
 #if !BUILDFLAG(IS_TIZEN_TV)
 #include "wrt/src/browser/vibration_manager.h"

diff --git a/wrt/src/browser/tv/native_web_runtime_delegate_tv.cc b/wrt/src/browser/tv/native_web_runtime_delegate_tv.cc
index f035883..84fde01 100644 (file)
--- a/wrt/src/browser/tv/native_web_runtime_delegate_tv.cc
+++ b/wrt/src/browser/tv/native_web_runtime_delegate_tv.cc
@@ -49,6 +49,7 @@
 #include "tizen_src/ewk/efl_integration/ewk_privilege_checker.h"
 #endif
 #include "v8/include/v8.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h"
 #include "wrt/src/app/tv/wrt_main_delegate_tv.h"
 #include "wrt/src/base/platform_info.h"
 #include "wrt/src/browser/native_web_runtime.h"
@@ -61,7 +62,6 @@
 #include "wrt/src/browser/wrt_browser_context.h"
 #include "wrt/src/common/constants.h"
 #include "wrt/src/common/tv/application_data_tv.h"
-#include "wrt/xwalk_extensions/browser/xwalk_extension_manager.h"
 
 #if defined(TIZEN_PEPPER_EXTENSIONS)
 #include "tizen_src/ewk/efl_integration/common/trusted_pepper_plugin_util.h"

diff --git a/wrt/src/browser/tv/wrt_browser_client_tv.cc b/wrt/src/browser/tv/wrt_browser_client_tv.cc
index c98d1d6..e59ca88 100755 (executable)
--- a/wrt/src/browser/tv/wrt_browser_client_tv.cc
+++ b/wrt/src/browser/tv/wrt_browser_client_tv.cc
@@ -8,6 +8,7 @@
 #include "content/public/common/content_switches.h"
 #include "services/network/public/mojom/network_context.mojom.h"
 #include "third_party/blink/public/common/web_preferences/web_preferences.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h"
 #if !defined(WRT_JS_BRINGUP)
 #include "tizen_src/chromium_impl/content/public/browser/certificates_utils.h"
 #endif
@@ -16,7 +17,6 @@
 #include "wrt/src/browser/tv/native_web_runtime_delegate_tv.h"
 #include "wrt/src/common/application_data.h"
 #include "wrt/src/common/privilege.h"
-#include "wrt/xwalk_extensions/browser/xwalk_extension_manager.h"
 
 namespace wrt {
 

diff --git a/wrt/src/browser/tv/wrt_xwalk_extension_browser_tv.cc b/wrt/src/browser/tv/wrt_xwalk_extension_browser_tv.cc
index 7d1c307..f501219 100644 (file)
--- a/wrt/src/browser/tv/wrt_xwalk_extension_browser_tv.cc
+++ b/wrt/src/browser/tv/wrt_xwalk_extension_browser_tv.cc
@@ -13,13 +13,13 @@
 #include "base/strings/string_split.h"
 #include "electron/shell/browser/browser.h"
 #include "electron/shell/browser/window_list.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h"
 #include "wrt/src/browser/tv/input_device_manager.h"
 #include "wrt/src/browser/tv/native_web_runtime_delegate_tv.h"
 #include "wrt/src/browser/tv/tv_window_manager.h"
 #include "wrt/src/browser/tv/wrt_native_window_tv.h"
 #include "wrt/src/common/application_data.h"
 #include "wrt/src/common/constants.h"
-#include "wrt/xwalk_extensions/browser/xwalk_extension_manager.h"
 
 #ifndef XWALK_EXTENSION_PATH
   #error XWALK_EXTENSION_PATH is not set.

diff --git a/wrt/src/browser/wrt_browser_client.cc b/wrt/src/browser/wrt_browser_client.cc
index c844d8b..b92d9d9 100755 (executable)
--- a/wrt/src/browser/wrt_browser_client.cc
+++ b/wrt/src/browser/wrt_browser_client.cc
@@ -13,6 +13,7 @@
 #include "services/service_manager/public/cpp/manifest.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
 #include "third_party/blink/public/common/web_preferences/web_preferences.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h"
 #if !defined(WRT_JS_BRINGUP)
 #include "tizen_src/chromium_impl/content/browser/browsable_app_control.h"
 #endif
@@ -34,7 +35,6 @@
 #include "wrt/src/common/application_data.h"
 #include "wrt/src/common/constants.h"
 #include "wrt/src/common/locale_manager.h"
-#include "wrt/xwalk_extensions/browser/xwalk_extension_manager.h"
 
 #if defined(TIZEN_WEB_SPEECH_RECOGNITION)
 #include "content/browser/speech/tts_platform_impl_tizen.h"

diff --git a/wrt/src/browser/wrt_xwalk_extension_browser.cc b/wrt/src/browser/wrt_xwalk_extension_browser.cc
index c15522d..53b657d 100644 (file)
--- a/wrt/src/browser/wrt_xwalk_extension_browser.cc
+++ b/wrt/src/browser/wrt_xwalk_extension_browser.cc
@@ -9,6 +9,7 @@
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/navigation_entry.h"
 #include "electron/shell/browser/browser.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h"
 #include "wrt/src/base/file_utils.h"
 #include "wrt/src/base/string_utils.h"
 #include "wrt/src/browser/native_web_runtime.h"
@@ -17,7 +18,6 @@
 #include "wrt/src/browser/wrt_native_window.h"
 #include "wrt/src/browser/wrt_web_contents.h"
 #include "wrt/src/service/wrt_service_manager.h"
-#include "wrt/xwalk_extensions/browser/xwalk_extension_manager.h"
 
 #ifndef XWALK_EXTENSION_PATH
   #error XWALK_EXTENSION_PATH is not set.

diff --git a/wrt/src/browser/wrt_xwalk_extension_browser.h b/wrt/src/browser/wrt_xwalk_extension_browser.h
index 431de79..8b7c389 100644 (file)
--- a/wrt/src/browser/wrt_xwalk_extension_browser.h
+++ b/wrt/src/browser/wrt_xwalk_extension_browser.h
@@ -7,7 +7,7 @@
 
 #include <map>
 
-#include "wrt/xwalk_extensions/common/xwalk_extension_browser_delegate.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/common/xwalk_extension_browser_delegate.h"
 
 namespace wrt {
 

diff --git a/wrt/src/renderer/tv/wrt_renderer_client_tv.cc b/wrt/src/renderer/tv/wrt_renderer_client_tv.cc
index 5c8fc56..8357d6d 100755 (executable)
--- a/wrt/src/renderer/tv/wrt_renderer_client_tv.cc
+++ b/wrt/src/renderer/tv/wrt_renderer_client_tv.cc
@@ -11,6 +11,7 @@
 #include "content/public/renderer/render_frame.h"
 #include "net/base/net_errors.h"
 #include "third_party/blink/public/platform/web_url_error.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h"
 #include "tizen_src/chromium_impl/content/renderer/common_renderer_client.h"
 #include "tizen_src/ewk/efl_integration/common/application_type.h"
 #include "tizen_src/ewk/efl_integration/common/content_switches_efl.h"
@@ -22,7 +23,6 @@
 #include "wrt/src/browser/tv/widget_state.h"
 #include "wrt/src/common/constants.h"
 #include "wrt/src/common/privilege.h"
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h"
 
 #if defined(TIZEN_PEPPER_EXTENSIONS)
 #include "tizen_src/ewk/efl_integration/common/trusted_pepper_plugin_util.h"

diff --git a/wrt/src/renderer/wrt_render_frame_observer.cc b/wrt/src/renderer/wrt_render_frame_observer.cc
index 3dbc59b..6dc8a3e 100755 (executable)
--- a/wrt/src/renderer/wrt_render_frame_observer.cc
+++ b/wrt/src/renderer/wrt_render_frame_observer.cc
@@ -11,10 +11,10 @@
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "third_party/blink/public/web/web_script_source.h"
 #include "third_party/blink/public/web/web_view.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h"
 #include "tizen_src/chromium_impl/tizen/system_info.h"
 #include "wrt/src/common/application_data.h"
 #include "wrt/src/renderer/wrt_renderer_client.h"
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h"
 
 #if ENABLE_CHROME_EXTENSIONS
 #include <json/json.h>

diff --git a/wrt/src/renderer/wrt_renderer_client.cc b/wrt/src/renderer/wrt_renderer_client.cc
index b9d6ff9..54f9e47 100755 (executable)
--- a/wrt/src/renderer/wrt_renderer_client.cc
+++ b/wrt/src/renderer/wrt_renderer_client.cc
@@ -15,6 +15,7 @@
 #include "third_party/blink/public/platform/url_conversion.h"
 #include "third_party/blink/public/web/web_document.h"
 #include "third_party/blink/public/web/web_view.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h"
 #include "tizen_src/chromium_impl/content/renderer/common_renderer_client.h"
 #include "tizen_src/ewk/efl_integration/common/navigation_policy_params.h"
 #include "tizen_src/ewk/efl_integration/common/render_messages_ewk.h"
@@ -23,7 +24,6 @@
 #include "wrt/src/common/application_data.h"
 #include "wrt/src/common/locale_manager.h"
 #include "wrt/src/renderer/wrt_render_frame_observer.h"
-#include "wrt/xwalk_extensions/renderer/xwalk_extension_renderer_controller.h"
 
 #if ENABLE_CHROME_EXTENSIONS
 #include "wrt/src/common/extensions/wrt_extensions_client.h"

diff --git a/wrt/src/service/wrt_service_manager.cc b/wrt/src/service/wrt_service_manager.cc
index d1f06ae..b780eb1 100644 (file)
--- a/wrt/src/service/wrt_service_manager.cc
+++ b/wrt/src/service/wrt_service_manager.cc
@@ -13,9 +13,9 @@
 
 #include "base/strings/string_split.h"
 #include "base/threading/platform_thread.h"
+#include "tizen_src/chromium_impl/components/xwalk_extensions/browser/xwalk_extension_manager.h"
 #include "wrt/src/browser/api/wrt_api_web_runtime.h"
 #include "wrt/src/service/wrt_service.h"
-#include "wrt/xwalk_extensions/browser/xwalk_extension_manager.h"
 
 #if BUILDFLAG(IS_TIZEN_TV) && TIZEN_VERSION_AT_LEAST(7, 0, 0)
 #include <boost-api.h>