Merge pull request #75 from JongHeonChoi/enable_web_ime
authorSeungkeun Lee <sngn.lee@samsung.com>
Mon, 30 May 2016 01:26:27 +0000 (10:26 +0900)
committerSeungkeun Lee <sngn.lee@samsung.com>
Mon, 30 May 2016 01:26:27 +0000 (10:26 +0900)
Apply to Web IME

1  2 
runtime/browser/web_application.cc

@@@ -220,7 -220,7 +220,7 @@@ WebApplication::WebApplication
    std::unique_ptr<char, decltype(std::free)*> path{app_get_data_path(),
                                                     std::free};
    app_data_path_ = path.get();
-   LOGGER(ERROR) << "path is " << path.get();
+   LOGGER(DEBUG) << "path is " << path.get();
    splash_screen_.reset(new SplashScreen(
        window_, app_data_->splash_screen_info(), app_data_->application_path()));
    resource_manager_.reset(
@@@ -376,7 -376,6 +376,6 @@@ void WebApplication::Launch(std::unique
    view->LoadUrl(res->uri(), res->mime());
    view_stack_.push_front(view);
  
    if (appcontrol->data(AUL_K_DEBUG) == "1") {
      debug_mode_ = true;
      LaunchInspector(appcontrol.get());
@@@ -951,7 -950,7 +950,7 @@@ void WebApplication::OnAuthenticationRe
  }
  
  void WebApplication::OnCertificateAllowRequest(
 -    WebView*, const std::string& /*url*/, const std::string& pem,
 +    WebView*, const std::string& url, const std::string& pem,
      std::function<void(bool allow)> result_handler) {
    auto db = common::AppDB::GetInstance();
    std::string reminder =
    popup->SetButtonType(Popup::ButtonType::AllowDenyButton);
    popup->SetTitle(popup_string::kPopupTitleCert);
    popup->SetBody(popup_string::kPopupBodyCert);
 +  popup->SetUrl(url);
    popup->SetCheckBox(popup_string::kPopupCheckRememberPreference);
    popup->SetResultHandler(
        [db, result_handler, pem](Popup* popup, void* /*user_data*/) {