Handle AppControl in WebApplication

Change-Id: I887106315bf6f265d4e401001e1294f26ff6eed9

diff --git a/src/runtime/app_control.h b/src/runtime/app_control.h
old mode 100644 (file)
new mode 100755 (executable)
index 534c3f0..2ac6f84
--- a/src/runtime/app_control.h
+++ b/src/runtime/app_control.h
@@ -16,6 +16,9 @@ class AppControl {
  public:
   explicit AppControl(app_control_h app_control);
   ~AppControl();
+  // disable copy
+  AppControl(const AppControl& src) = delete;
+  AppControl& operator=(const AppControl&) = delete;
 
   std::string operation() const;
   std::string mime() const;

diff --git a/src/runtime/runtime.cc b/src/runtime/runtime.cc
index c62046615bafd02183c9f373ac79b07a9e3708b9..c3be665a72d03055aaaf8d6688386ed351ded31c 100755 (executable)
--- a/src/runtime/runtime.cc
+++ b/src/runtime/runtime.cc
@@ -6,10 +6,12 @@
 
 #include <ewk_chromium.h>
 #include <string>
+#include <memory>
 
 #include "common/logger.h"
 #include "runtime/command_line.h"
 #include "runtime/native_app_window.h"
+#include "runtime/app_control.h"
 
 namespace wrt {
 
@@ -65,11 +67,13 @@ void Runtime::OnResume() {
 }
 
 void Runtime::OnAppControl(app_control_h app_control) {
+  std::unique_ptr<AppControl> appcontrol(new AppControl(app_control));
+
   if (application_->initialized()) {
     // Process AppControl
-    application_->AppControl();
+    application_->AppControl(std::move(appcontrol));
   } else {
-    application_->Launch();
+    application_->Launch(std::move(appcontrol));
   }
 }
 

diff --git a/src/runtime/web_application.cc b/src/runtime/web_application.cc
index 3d01943c1c30d1172d0cc1dc3a8c6025dffae253..9ed87f52dbb9fe05648ad9c6fc7d905857253404 100755 (executable)
--- a/src/runtime/web_application.cc
+++ b/src/runtime/web_application.cc
@@ -15,6 +15,7 @@
 #include "runtime/web_view.h"
 #include "runtime/vibration_manager.h"
 #include "common/logger.h"
+#include "runtime/app_control.h"
 
 namespace {
   // TODO(sngn.lee) : It should be declare in common header
@@ -110,7 +111,7 @@ bool WebApplication::Initialize(NativeWindow* window) {
   return true;
 }
 
-void WebApplication::Launch() {
+void WebApplication::Launch(std::unique_ptr<wrt::AppControl> appcontrol) {
   initialized_ = true;
   WebView* view = new WebView(window_, ewk_context_);
   view->SetEventListener(this);
@@ -137,7 +138,7 @@ void WebApplication::Launch() {
   window_->Show();
 }
 
-void WebApplication::AppControl() {
+void WebApplication::AppControl(std::unique_ptr<wrt::AppControl> appcontrol) {
   // TODO(sngn.lee): find the app control url and the reset options
 
   // TODO(sngn.lee): Set the injected bundle into extension process

diff --git a/src/runtime/web_application.h b/src/runtime/web_application.h
index c4d1950dbb6510e2cdae7da1b704ecde21e25cfb..13371fab6452612271e7dd8b7031f4bbad0768a6 100755 (executable)
--- a/src/runtime/web_application.h
+++ b/src/runtime/web_application.h
@@ -7,6 +7,7 @@
 
 #include <string>
 #include <list>
+#include <memory>
 
 #include "runtime/web_view.h"
 #include "runtime/locale_manager.h"
@@ -16,14 +17,15 @@ class Ewk_Context;
 
 namespace wrt {
 class NativeWindow;
+class AppControl;
 
 class WebApplication : public WebView::EventListener {
  public:
   explicit WebApplication(const std::string& appid);
   virtual ~WebApplication();
 
-  void AppControl();
-  void Launch();
+  void AppControl(std::unique_ptr<wrt::AppControl> appcontrol);
+  void Launch(std::unique_ptr<wrt::AppControl> appcontrol);
   void Resume();
   void Suspend();