Merge "Terminate app when manifest can not be loaded." into devel/wrt2
authorWonYoung Choi <wy80.choi@samsung.com>
Wed, 29 Apr 2015 05:32:35 +0000 (14:32 +0900)
committerGerrit Code Review <gerrit@tizensrc>
Wed, 29 Apr 2015 05:32:36 +0000 (14:32 +0900)
1  2 
src/runtime/web_application.cc
src/runtime/web_application.h

@@@ -159,9 -131,21 +147,21 @@@ bool WebApplication::Initialize() 
  void WebApplication::Launch(std::unique_ptr<wrt::AppControl> appcontrol) {
    resource_manager_->set_app_control(appcontrol.get());
    WebView* view = new WebView(window_, ewk_context_);
 -  view->SetEventListener(this);
 +  SetupWebView(view);
  
+   // send widget info to injected bundle
+   // TODO(wy80.choi): ewk_send_widget_info should be fixed to receive uuid of
+   // application instead of widget_id.
+   // Currently, uuid is passed as encoded_bundle argument temporarily.
+   // ewk_send_widget_info(ewk_context_, 1,
+   //                     elm_config_scale_get(),
+   //                     elm_theme_get(NULL),
+   //                    uuid_.c_str());
+   // view->LoadUrl("file:///home/owner/apps_rw/33CFo0eFJe/"
+   //               "33CFo0eFJe.annex/index.html");
    view->LoadUrl(resource_manager_->GetStartURL());
    view_stack_.push_front(view);
    window_->SetContent(view->evas_object());
  
Simple merge