Add context menu support (issue #509):

- Add new CefContextMenuHandler, CefContextMenuParams and CefMenuModel classes.
- Add cef_strings.grd and related infrastructure for supporting translation of CEF strings.
- Generate include/cef_pack_resources.h and include/cef_pack_strings.h files at build time that include all IDs used by CEF pack files.

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

libcef_dll/cpptoc/client_cpptoc.cc

@@ -11,6 +11,7 @@
 //
 
 #include "libcef_dll/cpptoc/client_cpptoc.h"
+#include "libcef_dll/cpptoc/context_menu_handler_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"
@@ -119,6 +120,22 @@ struct _cef_jsdialog_handler_t* CEF_CALLBACK client_get_jsdialog_handler(
   return CefJSDialogHandlerCppToC::Wrap(_retval);
 }
 
+struct _cef_context_menu_handler_t* CEF_CALLBACK client_get_context_menu_handler(
+    struct _cef_client_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefRefPtr<CefContextMenuHandler> _retval = CefClientCppToC::Get(
+      self)->GetContextMenuHandler();
+
+  // Return type: refptr_same
+  return CefContextMenuHandlerCppToC::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) {
@@ -157,6 +174,7 @@ CefClientCppToC::CefClientCppToC(CefClient* cls)
   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_.get_context_menu_handler = client_get_context_menu_handler;
   struct_.struct_.on_process_message_recieved =
       client_on_process_message_recieved;
 }

libcef_dll/cpptoc/context_menu_handler_cpptoc.cc

@@ -0,0 +1,132 @@
+// 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/context_menu_handler_cpptoc.h"
+#include "libcef_dll/ctocpp/browser_ctocpp.h"
+#include "libcef_dll/ctocpp/context_menu_params_ctocpp.h"
+#include "libcef_dll/ctocpp/frame_ctocpp.h"
+#include "libcef_dll/ctocpp/menu_model_ctocpp.h"
+
+
+// MEMBER FUNCTIONS - Body may be edited by hand.
+
+void CEF_CALLBACK context_menu_handler_on_before_context_menu(
+    struct _cef_context_menu_handler_t* self, cef_browser_t* browser,
+    struct _cef_frame_t* frame, struct _cef_context_menu_params_t* params,
+    struct _cef_menu_model_t* model) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return;
+  // Verify param: frame; type: refptr_diff
+  DCHECK(frame);
+  if (!frame)
+    return;
+  // Verify param: params; type: refptr_diff
+  DCHECK(params);
+  if (!params)
+    return;
+  // Verify param: model; type: refptr_diff
+  DCHECK(model);
+  if (!model)
+    return;
+
+  // Execute
+  CefContextMenuHandlerCppToC::Get(self)->OnBeforeContextMenu(
+      CefBrowserCToCpp::Wrap(browser),
+      CefFrameCToCpp::Wrap(frame),
+      CefContextMenuParamsCToCpp::Wrap(params),
+      CefMenuModelCToCpp::Wrap(model));
+}
+
+int CEF_CALLBACK context_menu_handler_on_context_menu_command(
+    struct _cef_context_menu_handler_t* self, cef_browser_t* browser,
+    struct _cef_frame_t* frame, struct _cef_context_menu_params_t* params,
+    int command_id, enum cef_event_flags_t event_flags) {
+  // 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: frame; type: refptr_diff
+  DCHECK(frame);
+  if (!frame)
+    return 0;
+  // Verify param: params; type: refptr_diff
+  DCHECK(params);
+  if (!params)
+    return 0;
+
+  // Execute
+  bool _retval = CefContextMenuHandlerCppToC::Get(self)->OnContextMenuCommand(
+      CefBrowserCToCpp::Wrap(browser),
+      CefFrameCToCpp::Wrap(frame),
+      CefContextMenuParamsCToCpp::Wrap(params),
+      command_id,
+      event_flags);
+
+  // Return type: bool
+  return _retval;
+}
+
+void CEF_CALLBACK context_menu_handler_on_context_menu_dismissed(
+    struct _cef_context_menu_handler_t* self, cef_browser_t* browser,
+    struct _cef_frame_t* frame) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return;
+  // Verify param: browser; type: refptr_diff
+  DCHECK(browser);
+  if (!browser)
+    return;
+  // Verify param: frame; type: refptr_diff
+  DCHECK(frame);
+  if (!frame)
+    return;
+
+  // Execute
+  CefContextMenuHandlerCppToC::Get(self)->OnContextMenuDismissed(
+      CefBrowserCToCpp::Wrap(browser),
+      CefFrameCToCpp::Wrap(frame));
+}
+
+
+// CONSTRUCTOR - Do not edit by hand.
+
+CefContextMenuHandlerCppToC::CefContextMenuHandlerCppToC(
+    CefContextMenuHandler* cls)
+    : CefCppToC<CefContextMenuHandlerCppToC, CefContextMenuHandler,
+        cef_context_menu_handler_t>(cls) {
+  struct_.struct_.on_before_context_menu =
+      context_menu_handler_on_before_context_menu;
+  struct_.struct_.on_context_menu_command =
+      context_menu_handler_on_context_menu_command;
+  struct_.struct_.on_context_menu_dismissed =
+      context_menu_handler_on_context_menu_dismissed;
+}
+
+#ifndef NDEBUG
+template<> long CefCppToC<CefContextMenuHandlerCppToC, CefContextMenuHandler,
+    cef_context_menu_handler_t>::DebugObjCt = 0;
+#endif
+

libcef_dll/cpptoc/context_menu_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_CONTEXT_MENU_HANDLER_CPPTOC_H_
+#define CEF_LIBCEF_DLL_CPPTOC_CONTEXT_MENU_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_context_menu_handler.h"
+#include "include/capi/cef_context_menu_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 CefContextMenuHandlerCppToC
+    : public CefCppToC<CefContextMenuHandlerCppToC, CefContextMenuHandler,
+        cef_context_menu_handler_t> {
+ public:
+  explicit CefContextMenuHandlerCppToC(CefContextMenuHandler* cls);
+  virtual ~CefContextMenuHandlerCppToC() {}
+};
+
+#endif  // USING_CEF_SHARED
+#endif  // CEF_LIBCEF_DLL_CPPTOC_CONTEXT_MENU_HANDLER_CPPTOC_H_
+

libcef_dll/cpptoc/context_menu_params_cpptoc.cc

@@ -0,0 +1,296 @@
+// 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/context_menu_params_cpptoc.h"
+
+
+// MEMBER FUNCTIONS - Body may be edited by hand.
+
+int CEF_CALLBACK context_menu_params_get_xcoord(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  // Execute
+  int _retval = CefContextMenuParamsCppToC::Get(self)->GetXCoord();
+
+  // Return type: simple
+  return _retval;
+}
+
+int CEF_CALLBACK context_menu_params_get_ycoord(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  // Execute
+  int _retval = CefContextMenuParamsCppToC::Get(self)->GetYCoord();
+
+  // Return type: simple
+  return _retval;
+}
+
+enum cef_context_menu_type_flags_t CEF_CALLBACK context_menu_params_get_type_flags(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return CM_TYPEFLAG_NONE;
+
+  // Execute
+  cef_context_menu_type_flags_t _retval = CefContextMenuParamsCppToC::Get(
+      self)->GetTypeFlags();
+
+  // Return type: simple
+  return _retval;
+}
+
+cef_string_userfree_t CEF_CALLBACK context_menu_params_get_link_url(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefString _retval = CefContextMenuParamsCppToC::Get(self)->GetLinkUrl();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
+}
+
+cef_string_userfree_t CEF_CALLBACK context_menu_params_get_unfiltered_link_url(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefString _retval = CefContextMenuParamsCppToC::Get(
+      self)->GetUnfilteredLinkUrl();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
+}
+
+cef_string_userfree_t CEF_CALLBACK context_menu_params_get_source_url(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefString _retval = CefContextMenuParamsCppToC::Get(self)->GetSourceUrl();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
+}
+
+int CEF_CALLBACK context_menu_params_is_image_blocked(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  // Execute
+  bool _retval = CefContextMenuParamsCppToC::Get(self)->IsImageBlocked();
+
+  // Return type: bool
+  return _retval;
+}
+
+cef_string_userfree_t CEF_CALLBACK context_menu_params_get_page_url(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefString _retval = CefContextMenuParamsCppToC::Get(self)->GetPageUrl();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
+}
+
+cef_string_userfree_t CEF_CALLBACK context_menu_params_get_frame_url(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefString _retval = CefContextMenuParamsCppToC::Get(self)->GetFrameUrl();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
+}
+
+cef_string_userfree_t CEF_CALLBACK context_menu_params_get_frame_charset(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefString _retval = CefContextMenuParamsCppToC::Get(self)->GetFrameCharset();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
+}
+
+enum cef_context_menu_media_type_t CEF_CALLBACK context_menu_params_get_media_type(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return CM_MEDIATYPE_NONE;
+
+  // Execute
+  cef_context_menu_media_type_t _retval = CefContextMenuParamsCppToC::Get(
+      self)->GetMediaType();
+
+  // Return type: simple
+  return _retval;
+}
+
+enum cef_context_menu_media_state_flags_t CEF_CALLBACK context_menu_params_get_media_state_flags(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return CM_MEDIAFLAG_NONE;
+
+  // Execute
+  cef_context_menu_media_state_flags_t _retval =
+      CefContextMenuParamsCppToC::Get(self)->GetMediaStateFlags();
+
+  // Return type: simple
+  return _retval;
+}
+
+cef_string_userfree_t CEF_CALLBACK context_menu_params_get_selection_text(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return NULL;
+
+  // Execute
+  CefString _retval = CefContextMenuParamsCppToC::Get(self)->GetSelectionText();
+
+  // Return type: string
+  return _retval.DetachToUserFree();
+}
+
+int CEF_CALLBACK context_menu_params_is_editable(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  // Execute
+  bool _retval = CefContextMenuParamsCppToC::Get(self)->IsEditable();
+
+  // Return type: bool
+  return _retval;
+}
+
+int CEF_CALLBACK context_menu_params_is_speech_input_enabled(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return 0;
+
+  // Execute
+  bool _retval = CefContextMenuParamsCppToC::Get(self)->IsSpeechInputEnabled();
+
+  // Return type: bool
+  return _retval;
+}
+
+enum cef_context_menu_edit_state_flags_t CEF_CALLBACK context_menu_params_get_edit_state_flags(
+    struct _cef_context_menu_params_t* self) {
+  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
+
+  DCHECK(self);
+  if (!self)
+    return CM_EDITFLAG_NONE;
+
+  // Execute
+  cef_context_menu_edit_state_flags_t _retval = CefContextMenuParamsCppToC::Get(
+      self)->GetEditStateFlags();
+
+  // Return type: simple
+  return _retval;
+}
+
+
+// CONSTRUCTOR - Do not edit by hand.
+
+CefContextMenuParamsCppToC::CefContextMenuParamsCppToC(
+    CefContextMenuParams* cls)
+    : CefCppToC<CefContextMenuParamsCppToC, CefContextMenuParams,
+        cef_context_menu_params_t>(cls) {
+  struct_.struct_.get_xcoord = context_menu_params_get_xcoord;
+  struct_.struct_.get_ycoord = context_menu_params_get_ycoord;
+  struct_.struct_.get_type_flags = context_menu_params_get_type_flags;
+  struct_.struct_.get_link_url = context_menu_params_get_link_url;
+  struct_.struct_.get_unfiltered_link_url =
+      context_menu_params_get_unfiltered_link_url;
+  struct_.struct_.get_source_url = context_menu_params_get_source_url;
+  struct_.struct_.is_image_blocked = context_menu_params_is_image_blocked;
+  struct_.struct_.get_page_url = context_menu_params_get_page_url;
+  struct_.struct_.get_frame_url = context_menu_params_get_frame_url;
+  struct_.struct_.get_frame_charset = context_menu_params_get_frame_charset;
+  struct_.struct_.get_media_type = context_menu_params_get_media_type;
+  struct_.struct_.get_media_state_flags =
+      context_menu_params_get_media_state_flags;
+  struct_.struct_.get_selection_text = context_menu_params_get_selection_text;
+  struct_.struct_.is_editable = context_menu_params_is_editable;
+  struct_.struct_.is_speech_input_enabled =
+      context_menu_params_is_speech_input_enabled;
+  struct_.struct_.get_edit_state_flags =
+      context_menu_params_get_edit_state_flags;
+}
+
+#ifndef NDEBUG
+template<> long CefCppToC<CefContextMenuParamsCppToC, CefContextMenuParams,
+    cef_context_menu_params_t>::DebugObjCt = 0;
+#endif
+

libcef_dll/cpptoc/context_menu_params_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_CONTEXT_MENU_PARAMS_CPPTOC_H_
+#define CEF_LIBCEF_DLL_CPPTOC_CONTEXT_MENU_PARAMS_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_context_menu_handler.h"
+#include "include/capi/cef_context_menu_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 CefContextMenuParamsCppToC
+    : public CefCppToC<CefContextMenuParamsCppToC, CefContextMenuParams,
+        cef_context_menu_params_t> {
+ public:
+  explicit CefContextMenuParamsCppToC(CefContextMenuParams* cls);
+  virtual ~CefContextMenuParamsCppToC() {}
+};
+
+#endif  // BUILDING_CEF_SHARED
+#endif  // CEF_LIBCEF_DLL_CPPTOC_CONTEXT_MENU_PARAMS_CPPTOC_H_
+

libcef_dll/cpptoc/menu_model_cpptoc.h

@@ -0,0 +1,36 @@
+// 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_MENU_MODEL_CPPTOC_H_
+#define CEF_LIBCEF_DLL_CPPTOC_MENU_MODEL_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_menu_model.h"
+#include "include/capi/cef_menu_model_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 CefMenuModelCppToC
+    : public CefCppToC<CefMenuModelCppToC, CefMenuModel, cef_menu_model_t> {
+ public:
+  explicit CefMenuModelCppToC(CefMenuModel* cls);
+  virtual ~CefMenuModelCppToC() {}
+};
+
+#endif  // BUILDING_CEF_SHARED
+#endif  // CEF_LIBCEF_DLL_CPPTOC_MENU_MODEL_CPPTOC_H_
+