Add support for JavaScript alert, confirm, prompt and onbeforeunload dialogs (issue #507).

- Add CefJSDialogHandler and CefJSDialogCallback interfaces.
- Add default dialog implementations for Windows and Mac OS-X.
- Add "JavaScript Dialogs" example to cefclient.
- Change TestHandler::AddResource to ignore the query component when matching URLs.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@594 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

libcef_dll/cpptoc/client_cpptoc.cc

@@ -13,6 +13,7 @@
 #include "libcef_dll/cpptoc/client_cpptoc.h"
 #include "libcef_dll/cpptoc/display_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/geolocation_handler_cpptoc.h"
+#include "libcef_dll/cpptoc/jsdialog_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/life_span_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/load_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/request_handler_cpptoc.h"
@@ -102,6 +103,22 @@ struct _cef_geolocation_handler_t* CEF_CALLBACK client_get_geolocation_handler(
   return CefGeolocationHandlerCppToC::Wrap(_retval);
 }
 
+struct _cef_jsdialog_handler_t* CEF_CALLBACK client_get_jsdialog_handler(
+    struct _cef_client_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefRefPtr<CefJSDialogHandler> _retval = CefClientCppToC::Get(
+      self)->GetJSDialogHandler();
+
+  // Return type: refptr_same
+  return CefJSDialogHandlerCppToC::Wrap(_retval);
+}
+
 int CEF_CALLBACK client_on_process_message_recieved(struct _cef_client_t* self,
     cef_browser_t* browser, enum cef_process_id_t source_process,
     struct _cef_process_message_t* message) {
@@ -139,6 +156,7 @@ CefClientCppToC::CefClientCppToC(CefClient* cls)
   struct_.struct_.get_request_handler = client_get_request_handler;
   struct_.struct_.get_display_handler = client_get_display_handler;
   struct_.struct_.get_geolocation_handler = client_get_geolocation_handler;
+  struct_.struct_.get_jsdialog_handler = client_get_jsdialog_handler;
   struct_.struct_.on_process_message_recieved =
       client_on_process_message_recieved;
 }

libcef_dll/cpptoc/jsdialog_callback_cpptoc.cc

@@ -0,0 +1,46 @@
+// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#include "libcef_dll/cpptoc/jsdialog_callback_cpptoc.h"
+
+
+// MEMBER FUNCTIONS - Body may be edited by hand.
+
+void CEF_CALLBACK jsdialog_callback_cont(struct _cef_jsdialog_callback_t* self,
+    int success, const cef_string_t* user_input) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+  // Unverified params: user_input
+
+  // Execute
+  CefJSDialogCallbackCppToC::Get(self)->Continue(
+      success?true:false,
+      CefString(user_input));
+}
+
+
+// CONSTRUCTOR - Do not edit by hand.
+
+CefJSDialogCallbackCppToC::CefJSDialogCallbackCppToC(CefJSDialogCallback* cls)
+    : CefCppToC<CefJSDialogCallbackCppToC, CefJSDialogCallback,
+        cef_jsdialog_callback_t>(cls) {
+  struct_.struct_.cont = jsdialog_callback_cont;
+}
+
+#ifndef NDEBUG
+template<> long CefCppToC<CefJSDialogCallbackCppToC, CefJSDialogCallback,
+    cef_jsdialog_callback_t>::DebugObjCt = 0;
+#endif
+

libcef_dll/cpptoc/jsdialog_callback_cpptoc.h

@@ -0,0 +1,37 @@
+// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#ifndef CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_CALLBACK_CPPTOC_H_
+#define CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_CALLBACK_CPPTOC_H_
+#pragma once
+
+#ifndef BUILDING_CEF_SHARED
+#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
+#else  // BUILDING_CEF_SHARED
+
+#include "include/cef_jsdialog_handler.h"
+#include "include/capi/cef_jsdialog_handler_capi.h"
+#include "libcef_dll/cpptoc/cpptoc.h"
+
+// Wrap a C++ class with a C structure.
+// This class may be instantiated and accessed DLL-side only.
+class CefJSDialogCallbackCppToC
+    : public CefCppToC<CefJSDialogCallbackCppToC, CefJSDialogCallback,
+        cef_jsdialog_callback_t> {
+ public:
+  explicit CefJSDialogCallbackCppToC(CefJSDialogCallback* cls);
+  virtual ~CefJSDialogCallbackCppToC() {}
+};
+
+#endif  // BUILDING_CEF_SHARED
+#endif  // CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_CALLBACK_CPPTOC_H_
+

libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc

@@ -0,0 +1,136 @@
+// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#include "libcef_dll/cpptoc/jsdialog_handler_cpptoc.h"
+#include "libcef_dll/ctocpp/browser_ctocpp.h"
+#include "libcef_dll/ctocpp/jsdialog_callback_ctocpp.h"
+
+
+// MEMBER FUNCTIONS - Body may be edited by hand.
+
+int CEF_CALLBACK jsdialog_handler_on_jsdialog(
+    struct _cef_jsdialog_handler_t* self, cef_browser_t* browser,
+    const cef_string_t* origin_url, const cef_string_t* accept_lang,
+    enum cef_jsdialog_type_t dialog_type, const cef_string_t* message_text,
+    const cef_string_t* default_prompt_text, cef_jsdialog_callback_t* callback,
+    int* suppress_message) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: origin_url; type: string_byref_const
+  DCHECK(origin_url);
+  if (!origin_url)
+    return 0;
+  // Verify param: callback; type: refptr_diff
+  DCHECK(callback);
+  if (!callback)
+    return 0;
+  // Verify param: suppress_message; type: bool_byref
+  DCHECK(suppress_message);
+  if (!suppress_message)
+    return 0;
+  // Unverified params: accept_lang, message_text, default_prompt_text
+
+  // Translate param: suppress_message; type: bool_byref
+  bool suppress_messageBool = (
+      suppress_message && *suppress_message)?true:false;
+
+  // Execute
+  bool _retval = CefJSDialogHandlerCppToC::Get(self)->OnJSDialog(
+      CefBrowserCToCpp::Wrap(browser),
+      CefString(origin_url),
+      CefString(accept_lang),
+      dialog_type,
+      CefString(message_text),
+      CefString(default_prompt_text),
+      CefJSDialogCallbackCToCpp::Wrap(callback),
+      suppress_messageBool);
+
+  // Restore param: suppress_message; type: bool_byref
+  if (suppress_message)
+    *suppress_message = suppress_messageBool?true:false;
+
+  // Return type: bool
+  return _retval;
+}
+
+int CEF_CALLBACK jsdialog_handler_on_before_unload_dialog(
+    struct _cef_jsdialog_handler_t* self, cef_browser_t* browser,
+    const cef_string_t* message_text, int is_reload,
+    cef_jsdialog_callback_t* callback) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return 0;
+  // Verify param: callback; type: refptr_diff
+  DCHECK(callback);
+  if (!callback)
+    return 0;
+  // Unverified params: message_text
+
+  // Execute
+  bool _retval = CefJSDialogHandlerCppToC::Get(self)->OnBeforeUnloadDialog(
+      CefBrowserCToCpp::Wrap(browser),
+      CefString(message_text),
+      is_reload?true:false,
+      CefJSDialogCallbackCToCpp::Wrap(callback));
+
+  // Return type: bool
+  return _retval;
+}
+
+void CEF_CALLBACK jsdialog_handler_on_reset_dialog_state(
+    struct _cef_jsdialog_handler_t* self, cef_browser_t* browser) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return;
+
+  // Execute
+  CefJSDialogHandlerCppToC::Get(self)->OnResetDialogState(
+      CefBrowserCToCpp::Wrap(browser));
+}
+
+
+// CONSTRUCTOR - Do not edit by hand.
+
+CefJSDialogHandlerCppToC::CefJSDialogHandlerCppToC(CefJSDialogHandler* cls)
+    : CefCppToC<CefJSDialogHandlerCppToC, CefJSDialogHandler,
+        cef_jsdialog_handler_t>(cls) {
+  struct_.struct_.on_jsdialog = jsdialog_handler_on_jsdialog;
+  struct_.struct_.on_before_unload_dialog =
+      jsdialog_handler_on_before_unload_dialog;
+  struct_.struct_.on_reset_dialog_state =
+      jsdialog_handler_on_reset_dialog_state;
+}
+
+#ifndef NDEBUG
+template<> long CefCppToC<CefJSDialogHandlerCppToC, CefJSDialogHandler,
+    cef_jsdialog_handler_t>::DebugObjCt = 0;
+#endif
+

libcef_dll/cpptoc/jsdialog_handler_cpptoc.h

@@ -0,0 +1,37 @@
+// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#ifndef CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_HANDLER_CPPTOC_H_
+#define CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_HANDLER_CPPTOC_H_
+#pragma once
+
+#ifndef USING_CEF_SHARED
+#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
+#else  // USING_CEF_SHARED
+
+#include "include/cef_jsdialog_handler.h"
+#include "include/capi/cef_jsdialog_handler_capi.h"
+#include "libcef_dll/cpptoc/cpptoc.h"
+
+// Wrap a C++ class with a C structure.
+// This class may be instantiated and accessed wrapper-side only.
+class CefJSDialogHandlerCppToC
+    : public CefCppToC<CefJSDialogHandlerCppToC, CefJSDialogHandler,
+        cef_jsdialog_handler_t> {
+ public:
+  explicit CefJSDialogHandlerCppToC(CefJSDialogHandler* cls);
+  virtual ~CefJSDialogHandlerCppToC() {}
+};
+
+#endif  // USING_CEF_SHARED
+#endif  // CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_HANDLER_CPPTOC_H_
+

libcef_dll/ctocpp/client_ctocpp.cc

@@ -15,6 +15,7 @@
 #include "libcef_dll/ctocpp/client_ctocpp.h"
 #include "libcef_dll/ctocpp/display_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/geolocation_handler_ctocpp.h"
+#include "libcef_dll/ctocpp/jsdialog_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/life_span_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/load_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/request_handler_ctocpp.h"
@@ -88,6 +89,19 @@ CefRefPtr<CefGeolocationHandler> CefClientCToCpp::GetGeolocationHandler() {
   return CefGeolocationHandlerCToCpp::Wrap(_retval);
 }
 
+CefRefPtr<CefJSDialogHandler> CefClientCToCpp::GetJSDialogHandler() {
+  if (CEF_MEMBER_MISSING(struct_, get_jsdialog_handler))
+    return NULL;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Execute
+  cef_jsdialog_handler_t* _retval = struct_->get_jsdialog_handler(struct_);
+
+  // Return type: refptr_same
+  return CefJSDialogHandlerCToCpp::Wrap(_retval);
+}
+
 bool CefClientCToCpp::OnProcessMessageRecieved(CefRefPtr<CefBrowser> browser,
     CefProcessId source_process, CefRefPtr<CefProcessMessage> message) {
   if (CEF_MEMBER_MISSING(struct_, on_process_message_recieved))

libcef_dll/ctocpp/client_ctocpp.h

@@ -37,6 +37,7 @@ class CefClientCToCpp
   virtual CefRefPtr<CefRequestHandler> GetRequestHandler() OVERRIDE;
   virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() OVERRIDE;
   virtual CefRefPtr<CefGeolocationHandler> GetGeolocationHandler() OVERRIDE;
+  virtual CefRefPtr<CefJSDialogHandler> GetJSDialogHandler() OVERRIDE;
   virtual bool OnProcessMessageRecieved(CefRefPtr<CefBrowser> browser,
       CefProcessId source_process,
       CefRefPtr<CefProcessMessage> message) OVERRIDE;

libcef_dll/ctocpp/jsdialog_callback_ctocpp.cc

@@ -0,0 +1,38 @@
+// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#include "libcef_dll/ctocpp/jsdialog_callback_ctocpp.h"
+
+
+// VIRTUAL METHODS - Body may be edited by hand.
+
+void CefJSDialogCallbackCToCpp::Continue(bool success,
+    const CefString& user_input) {
+  if (CEF_MEMBER_MISSING(struct_, cont))
+    return;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Unverified params: user_input
+
+  // Execute
+  struct_->cont(struct_,
+      success,
+      user_input.GetStruct());
+}
+
+
+#ifndef NDEBUG
+template<> long CefCToCpp<CefJSDialogCallbackCToCpp, CefJSDialogCallback,
+    cef_jsdialog_callback_t>::DebugObjCt = 0;
+#endif
+

libcef_dll/ctocpp/jsdialog_callback_ctocpp.h

@@ -0,0 +1,42 @@
+// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#ifndef CEF_LIBCEF_DLL_CTOCPP_JSDIALOG_CALLBACK_CTOCPP_H_
+#define CEF_LIBCEF_DLL_CTOCPP_JSDIALOG_CALLBACK_CTOCPP_H_
+#pragma once
+
+#ifndef USING_CEF_SHARED
+#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
+#else  // USING_CEF_SHARED
+
+#include "include/cef_jsdialog_handler.h"
+#include "include/capi/cef_jsdialog_handler_capi.h"
+#include "libcef_dll/ctocpp/ctocpp.h"
+
+// Wrap a C structure with a C++ class.
+// This class may be instantiated and accessed wrapper-side only.
+class CefJSDialogCallbackCToCpp
+    : public CefCToCpp<CefJSDialogCallbackCToCpp, CefJSDialogCallback,
+        cef_jsdialog_callback_t> {
+ public:
+  explicit CefJSDialogCallbackCToCpp(cef_jsdialog_callback_t* str)
+      : CefCToCpp<CefJSDialogCallbackCToCpp, CefJSDialogCallback,
+          cef_jsdialog_callback_t>(str) {}
+  virtual ~CefJSDialogCallbackCToCpp() {}
+
+  // CefJSDialogCallback methods
+  virtual void Continue(bool success, const CefString& user_input) OVERRIDE;
+};
+
+#endif  // USING_CEF_SHARED
+#endif  // CEF_LIBCEF_DLL_CTOCPP_JSDIALOG_CALLBACK_CTOCPP_H_
+

libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc

@@ -0,0 +1,116 @@
+// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#include "libcef_dll/cpptoc/browser_cpptoc.h"
+#include "libcef_dll/cpptoc/jsdialog_callback_cpptoc.h"
+#include "libcef_dll/ctocpp/jsdialog_handler_ctocpp.h"
+
+
+// VIRTUAL METHODS - Body may be edited by hand.
+
+bool CefJSDialogHandlerCToCpp::OnJSDialog(CefRefPtr<CefBrowser> browser,
+    const CefString& origin_url, const CefString& accept_lang,
+    JSDialogType dialog_type, const CefString& message_text,
+    const CefString& default_prompt_text,
+    CefRefPtr<CefJSDialogCallback> callback, bool& suppress_message) {
+  if (CEF_MEMBER_MISSING(struct_, on_jsdialog))
+    return false;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser.get());
+  if (!browser.get())
+    return false;
+  // Verify param: origin_url; type: string_byref_const
+  DCHECK(!origin_url.empty());
+  if (origin_url.empty())
+    return false;
+  // Verify param: callback; type: refptr_diff
+  DCHECK(callback.get());
+  if (!callback.get())
+    return false;
+  // Unverified params: accept_lang, message_text, default_prompt_text
+
+  // Translate param: suppress_message; type: bool_byref
+  int suppress_messageInt = suppress_message;
+
+  // Execute
+  int _retval = struct_->on_jsdialog(struct_,
+      CefBrowserCppToC::Wrap(browser),
+      origin_url.GetStruct(),
+      accept_lang.GetStruct(),
+      dialog_type,
+      message_text.GetStruct(),
+      default_prompt_text.GetStruct(),
+      CefJSDialogCallbackCppToC::Wrap(callback),
+      &suppress_messageInt);
+
+  // Restore param:suppress_message; type: bool_byref
+  suppress_message = suppress_messageInt?true:false;
+
+  // Return type: bool
+  return _retval?true:false;
+}
+
+bool CefJSDialogHandlerCToCpp::OnBeforeUnloadDialog(
+    CefRefPtr<CefBrowser> browser, const CefString& message_text,
+    bool is_reload, CefRefPtr<CefJSDialogCallback> callback) {
+  if (CEF_MEMBER_MISSING(struct_, on_before_unload_dialog))
+    return false;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser.get());
+  if (!browser.get())
+    return false;
+  // Verify param: callback; type: refptr_diff
+  DCHECK(callback.get());
+  if (!callback.get())
+    return false;
+  // Unverified params: message_text
+
+  // Execute
+  int _retval = struct_->on_before_unload_dialog(struct_,
+      CefBrowserCppToC::Wrap(browser),
+      message_text.GetStruct(),
+      is_reload,
+      CefJSDialogCallbackCppToC::Wrap(callback));
+
+  // Return type: bool
+  return _retval?true:false;
+}
+
+void CefJSDialogHandlerCToCpp::OnResetDialogState(
+    CefRefPtr<CefBrowser> browser) {
+  if (CEF_MEMBER_MISSING(struct_, on_reset_dialog_state))
+    return;
+
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser.get());
+  if (!browser.get())
+    return;
+
+  // Execute
+  struct_->on_reset_dialog_state(struct_,
+      CefBrowserCppToC::Wrap(browser));
+}
+
+
+#ifndef NDEBUG
+template<> long CefCToCpp<CefJSDialogHandlerCToCpp, CefJSDialogHandler,
+    cef_jsdialog_handler_t>::DebugObjCt = 0;
+#endif
+

libcef_dll/ctocpp/jsdialog_handler_ctocpp.h

@@ -0,0 +1,51 @@
+// Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool. If making changes by
+// hand only do so within the body of existing method and function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#ifndef CEF_LIBCEF_DLL_CTOCPP_JSDIALOG_HANDLER_CTOCPP_H_
+#define CEF_LIBCEF_DLL_CTOCPP_JSDIALOG_HANDLER_CTOCPP_H_
+#pragma once
+
+#ifndef BUILDING_CEF_SHARED
+#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
+#else  // BUILDING_CEF_SHARED
+
+#include "include/cef_jsdialog_handler.h"
+#include "include/capi/cef_jsdialog_handler_capi.h"
+#include "libcef_dll/ctocpp/ctocpp.h"
+
+// Wrap a C structure with a C++ class.
+// This class may be instantiated and accessed DLL-side only.
+class CefJSDialogHandlerCToCpp
+    : public CefCToCpp<CefJSDialogHandlerCToCpp, CefJSDialogHandler,
+        cef_jsdialog_handler_t> {
+ public:
+  explicit CefJSDialogHandlerCToCpp(cef_jsdialog_handler_t* str)
+      : CefCToCpp<CefJSDialogHandlerCToCpp, CefJSDialogHandler,
+          cef_jsdialog_handler_t>(str) {}
+  virtual ~CefJSDialogHandlerCToCpp() {}
+
+  // CefJSDialogHandler methods
+  virtual bool OnJSDialog(CefRefPtr<CefBrowser> browser,
+      const CefString& origin_url, const CefString& accept_lang,
+      JSDialogType dialog_type, const CefString& message_text,
+      const CefString& default_prompt_text,
+      CefRefPtr<CefJSDialogCallback> callback,
+      bool& suppress_message) OVERRIDE;
+  virtual bool OnBeforeUnloadDialog(CefRefPtr<CefBrowser> browser,
+      const CefString& message_text, bool is_reload,
+      CefRefPtr<CefJSDialogCallback> callback) OVERRIDE;
+  virtual void OnResetDialogState(CefRefPtr<CefBrowser> browser) OVERRIDE;
+};
+
+#endif  // BUILDING_CEF_SHARED
+#endif  // CEF_LIBCEF_DLL_CTOCPP_JSDIALOG_HANDLER_CTOCPP_H_
+

libcef_dll/libcef_dll.cc

@@ -31,6 +31,7 @@
 #include "libcef_dll/cpptoc/dictionary_value_cpptoc.h"
 #include "libcef_dll/cpptoc/frame_cpptoc.h"
 #include "libcef_dll/cpptoc/geolocation_callback_cpptoc.h"
+#include "libcef_dll/cpptoc/jsdialog_callback_cpptoc.h"
 #include "libcef_dll/cpptoc/list_value_cpptoc.h"
 #include "libcef_dll/cpptoc/post_data_cpptoc.h"
 #include "libcef_dll/cpptoc/post_data_element_cpptoc.h"
@@ -48,6 +49,7 @@
 #include "libcef_dll/ctocpp/cookie_visitor_ctocpp.h"
 #include "libcef_dll/ctocpp/display_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/geolocation_handler_ctocpp.h"
+#include "libcef_dll/ctocpp/jsdialog_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/life_span_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/load_handler_ctocpp.h"
 #include "libcef_dll/ctocpp/proxy_handler_ctocpp.h"
@@ -143,6 +145,8 @@ CEF_EXPORT void cef_shutdown() {
   DCHECK_EQ(CefFrameCppToC::DebugObjCt, 0);
   DCHECK_EQ(CefGeolocationCallbackCppToC::DebugObjCt, 0);
   DCHECK_EQ(CefGeolocationHandlerCToCpp::DebugObjCt, 0);
+  DCHECK_EQ(CefJSDialogCallbackCppToC::DebugObjCt, 0);
+  DCHECK_EQ(CefJSDialogHandlerCToCpp::DebugObjCt, 0);
   DCHECK_EQ(CefLifeSpanHandlerCToCpp::DebugObjCt, 0);
   DCHECK_EQ(CefListValueCppToC::DebugObjCt, 0);
   DCHECK_EQ(CefLoadHandlerCToCpp::DebugObjCt, 0);

libcef_dll/libcef_dll.rc

@@ -53,6 +53,42 @@ END
 #endif    // APSTUDIO_INVOKED
 
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ALERT DIALOGEX 0, 0, 241, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "JavaScript Alert"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,184,55,50,14
+    LTEXT           "",IDC_DIALOGTEXT,16,17,210,30
+END
+
+IDD_CONFIRM DIALOGEX 0, 0, 241, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "JavaScript Confirm"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    PUSHBUTTON      "Cancel",IDCANCEL,184,55,50,14
+    DEFPUSHBUTTON   "OK",IDOK,131,55,50,14
+    LTEXT           "",IDC_DIALOGTEXT,16,17,210,30
+END
+
+IDD_PROMPT DIALOGEX 0, 0, 241, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "JavaScript Prompt"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,131,55,50,14
+    LTEXT           "",IDC_DIALOGTEXT,16,17,210,18
+    PUSHBUTTON      "Cancel",IDCANCEL,184,55,50,14
+    EDITTEXT        IDC_PROMPTEDIT,15,33,210,14,ES_AUTOHSCROLL
+END
+
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version

libcef_dll/resource.h

@@ -6,6 +6,13 @@
 // Avoid files associated with MacOS
 #define _X86_
 
+#define IDD_ALERT                 130
+#define IDD_CONFIRM               131
+#define IDD_PROMPT                132
+#define IDC_PROMPTEDIT            1000
+#define IDC_DIALOGTEXT            1001
+
+
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED

libcef_dll/wrapper/libcef_dll_wrapper.cc

@@ -27,6 +27,7 @@
 #include "libcef_dll/cpptoc/cookie_visitor_cpptoc.h"
 #include "libcef_dll/cpptoc/display_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/geolocation_handler_cpptoc.h"
+#include "libcef_dll/cpptoc/jsdialog_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/life_span_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/load_handler_cpptoc.h"
 #include "libcef_dll/cpptoc/proxy_handler_cpptoc.h"
@@ -50,6 +51,7 @@
 #include "libcef_dll/ctocpp/dictionary_value_ctocpp.h"
 #include "libcef_dll/ctocpp/frame_ctocpp.h"
 #include "libcef_dll/ctocpp/geolocation_callback_ctocpp.h"
+#include "libcef_dll/ctocpp/jsdialog_callback_ctocpp.h"
 #include "libcef_dll/ctocpp/list_value_ctocpp.h"
 #include "libcef_dll/ctocpp/post_data_ctocpp.h"
 #include "libcef_dll/ctocpp/post_data_element_ctocpp.h"
@@ -135,6 +137,8 @@ CEF_GLOBAL void CefShutdown() {
   DCHECK_EQ(CefFrameCToCpp::DebugObjCt, 0);
   DCHECK_EQ(CefGeolocationCallbackCToCpp::DebugObjCt, 0);
   DCHECK_EQ(CefGeolocationHandlerCppToC::DebugObjCt, 0);
+  DCHECK_EQ(CefJSDialogCallbackCToCpp::DebugObjCt, 0);
+  DCHECK_EQ(CefJSDialogHandlerCppToC::DebugObjCt, 0);
   DCHECK_EQ(CefLifeSpanHandlerCppToC::DebugObjCt, 0);
   DCHECK_EQ(CefListValueCToCpp::DebugObjCt, 0);
   DCHECK_EQ(CefLoadHandlerCppToC::DebugObjCt, 0);