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/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_
+