bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix include of C API headers from C++ code (issue #1194). 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1607 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-02-10 17:20:38 +00:00
parent 0ff8f923f6
commit 7b873addd0
52 changed files with 159 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/capi/cef_app_capi.h
View File

@ -38,10 +38,6 @@
#define CEF_INCLUDE_CAPI_CEF_APP_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_APP_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_process_handler_capi.h" #include "include/capi/cef_browser_process_handler_capi.h"
#include "include/capi/cef_command_line_capi.h" #include "include/capi/cef_command_line_capi.h"
@ -49,6 +45,10 @@ extern "C" {
#include "include/capi/cef_resource_bundle_handler_capi.h" #include "include/capi/cef_resource_bundle_handler_capi.h"
#include "include/capi/cef_scheme_capi.h" #include "include/capi/cef_scheme_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
struct _cef_app_t; struct _cef_app_t;
/// ///

4
include/capi/cef_auth_callback_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_AUTH_CALLBACK_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_AUTH_CALLBACK_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Callback structure used for asynchronous continuation of authentication // Callback structure used for asynchronous continuation of authentication

10
include/capi/cef_base_capi.h
View File

@ -1,4 +1,4 @@
// Copyright (c) 2011 Marshall A. Greenblatt. All rights reserved. // Copyright (c) 2014 Marshall A. Greenblatt. All rights reserved.
// //
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are // modification, are permitted provided that the following conditions are
@ -31,10 +31,6 @@
#ifndef CEF_INCLUDE_CAPI_CEF_BASE_CAPI_H_ #ifndef CEF_INCLUDE_CAPI_CEF_BASE_CAPI_H_
#define CEF_INCLUDE_CAPI_CEF_BASE_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_BASE_CAPI_H_
#ifdef __cplusplus
extern "C" {
#endif
#include "include/internal/cef_export.h" #include "include/internal/cef_export.h"
#include "include/internal/cef_string.h" #include "include/internal/cef_string.h"
#include "include/internal/cef_string_list.h" #include "include/internal/cef_string_list.h"
@ -42,6 +38,10 @@ extern "C" {
#include "include/internal/cef_string_multimap.h" #include "include/internal/cef_string_multimap.h"
#include "include/internal/cef_types.h" #include "include/internal/cef_types.h"
#ifdef __cplusplus
extern "C" {
#endif
/// ///
// Structure defining the reference count implementation functions. All // Structure defining the reference count implementation functions. All
// framework structures must include the cef_base_t structure first. // framework structures must include the cef_base_t structure first.

8
include/capi/cef_browser_capi.h
View File

@ -38,15 +38,15 @@
#define CEF_INCLUDE_CAPI_CEF_BROWSER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_BROWSER_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_frame_capi.h" #include "include/capi/cef_frame_capi.h"
#include "include/capi/cef_process_message_capi.h" #include "include/capi/cef_process_message_capi.h"
#include "include/capi/cef_request_context_capi.h" #include "include/capi/cef_request_context_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
struct _cef_browser_host_t; struct _cef_browser_host_t;
struct _cef_client_t; struct _cef_client_t;

8
include/capi/cef_browser_process_handler_capi.h
View File

@ -38,14 +38,14 @@
#define CEF_INCLUDE_CAPI_CEF_BROWSER_PROCESS_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_BROWSER_PROCESS_HANDLER_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_command_line_capi.h" #include "include/capi/cef_command_line_capi.h"
#include "include/capi/cef_values_capi.h" #include "include/capi/cef_values_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
/// ///
// Structure used to implement browser process callbacks. The functions of this // Structure used to implement browser process callbacks. The functions of this

4
include/capi/cef_callback_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_CALLBACK_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_CALLBACK_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Generic callback structure used for asynchronous continuation. // Generic callback structure used for asynchronous continuation.

8
include/capi/cef_client_capi.h
View File

@ -38,10 +38,6 @@
#define CEF_INCLUDE_CAPI_CEF_CLIENT_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_CLIENT_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_context_menu_handler_capi.h" #include "include/capi/cef_context_menu_handler_capi.h"
#include "include/capi/cef_dialog_handler_capi.h" #include "include/capi/cef_dialog_handler_capi.h"
@ -58,6 +54,10 @@ extern "C" {
#include "include/capi/cef_render_handler_capi.h" #include "include/capi/cef_render_handler_capi.h"
#include "include/capi/cef_request_handler_capi.h" #include "include/capi/cef_request_handler_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
/// ///
// Implement this structure to provide handler implementations. // Implement this structure to provide handler implementations.

4
include/capi/cef_command_line_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_COMMAND_LINE_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_COMMAND_LINE_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Structure used to create and/or parse command line arguments. Arguments with // Structure used to create and/or parse command line arguments. Arguments with

8
include/capi/cef_context_menu_handler_capi.h
View File

@ -38,15 +38,15 @@
#define CEF_INCLUDE_CAPI_CEF_CONTEXT_MENU_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_CONTEXT_MENU_HANDLER_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h" #include "include/capi/cef_browser_capi.h"
#include "include/capi/cef_frame_capi.h" #include "include/capi/cef_frame_capi.h"
#include "include/capi/cef_menu_model_capi.h" #include "include/capi/cef_menu_model_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
struct _cef_context_menu_params_t; struct _cef_context_menu_params_t;
/// ///

6
include/capi/cef_cookie_capi.h
View File

@ -38,13 +38,13 @@
#define CEF_INCLUDE_CAPI_CEF_COOKIE_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_COOKIE_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_callback_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_callback_capi.h"
struct _cef_cookie_visitor_t; struct _cef_cookie_visitor_t;
/// ///

6
include/capi/cef_dialog_handler_capi.h
View File

@ -38,13 +38,13 @@
#define CEF_INCLUDE_CAPI_CEF_DIALOG_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_DIALOG_HANDLER_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h"
/// ///
// Callback structure for asynchronous continuation of file dialog requests. // Callback structure for asynchronous continuation of file dialog requests.

8
include/capi/cef_display_handler_capi.h
View File

@ -38,14 +38,14 @@
#define CEF_INCLUDE_CAPI_CEF_DISPLAY_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_DISPLAY_HANDLER_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h" #include "include/capi/cef_browser_capi.h"
#include "include/capi/cef_frame_capi.h" #include "include/capi/cef_frame_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
/// ///
// Implement this structure to handle events related to browser display state. // Implement this structure to handle events related to browser display state.

4
include/capi/cef_dom_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_DOM_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_DOM_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
struct _cef_domdocument_t; struct _cef_domdocument_t;
struct _cef_domevent_listener_t; struct _cef_domevent_listener_t;
struct _cef_domnode_t; struct _cef_domnode_t;

8
include/capi/cef_download_handler_capi.h
View File

@ -38,14 +38,14 @@
#define CEF_INCLUDE_CAPI_CEF_DOWNLOAD_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_DOWNLOAD_HANDLER_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h" #include "include/capi/cef_browser_capi.h"
#include "include/capi/cef_download_item_capi.h" #include "include/capi/cef_download_item_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
/// ///
// Callback structure used to asynchronously continue a download. // Callback structure used to asynchronously continue a download.

4
include/capi/cef_download_item_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_DOWNLOAD_ITEM_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_DOWNLOAD_ITEM_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Structure used to represent a download item. // Structure used to represent a download item.

4
include/capi/cef_drag_data_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_DRAG_DATA_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_DRAG_DATA_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Structure used to represent drag data. The functions of this structure may be // Structure used to represent drag data. The functions of this structure may be

8
include/capi/cef_drag_handler_capi.h
View File

@ -38,14 +38,14 @@
#define CEF_INCLUDE_CAPI_CEF_DRAG_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_DRAG_HANDLER_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h" #include "include/capi/cef_browser_capi.h"
#include "include/capi/cef_drag_data_capi.h" #include "include/capi/cef_drag_data_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
/// ///
// Implement this structure to handle events related to dragging. The functions // Implement this structure to handle events related to dragging. The functions

8
include/capi/cef_focus_handler_capi.h
View File

@ -38,15 +38,15 @@
#define CEF_INCLUDE_CAPI_CEF_FOCUS_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_FOCUS_HANDLER_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h" #include "include/capi/cef_browser_capi.h"
#include "include/capi/cef_dom_capi.h" #include "include/capi/cef_dom_capi.h"
#include "include/capi/cef_frame_capi.h" #include "include/capi/cef_frame_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
/// ///
// Implement this structure to handle events related to focus. The functions of // Implement this structure to handle events related to focus. The functions of

8
include/capi/cef_frame_capi.h
View File

@ -38,16 +38,16 @@
#define CEF_INCLUDE_CAPI_CEF_FRAME_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_FRAME_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_dom_capi.h" #include "include/capi/cef_dom_capi.h"
#include "include/capi/cef_request_capi.h" #include "include/capi/cef_request_capi.h"
#include "include/capi/cef_stream_capi.h" #include "include/capi/cef_stream_capi.h"
#include "include/capi/cef_string_visitor_capi.h" #include "include/capi/cef_string_visitor_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
struct _cef_browser_t; struct _cef_browser_t;
struct _cef_v8context_t; struct _cef_v8context_t;

4
include/capi/cef_geolocation_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_GEOLOCATION_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_GEOLOCATION_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Implement this structure to receive geolocation updates. The functions of // Implement this structure to receive geolocation updates. The functions of

6
include/capi/cef_geolocation_handler_capi.h
View File

@ -38,13 +38,13 @@
#define CEF_INCLUDE_CAPI_CEF_GEOLOCATION_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_GEOLOCATION_HANDLER_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h"
/// ///
// Callback structure used for asynchronous continuation of geolocation // Callback structure used for asynchronous continuation of geolocation

6
include/capi/cef_jsdialog_handler_capi.h
View File

@ -38,13 +38,13 @@
#define CEF_INCLUDE_CAPI_CEF_JSDIALOG_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_JSDIALOG_HANDLER_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h"
/// ///
// Callback structure used for asynchronous continuation of JavaScript dialog // Callback structure used for asynchronous continuation of JavaScript dialog

6
include/capi/cef_keyboard_handler_capi.h
View File

@ -38,13 +38,13 @@
#define CEF_INCLUDE_CAPI_CEF_KEYBOARD_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_KEYBOARD_HANDLER_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h"
/// ///
// Implement this structure to handle events related to keyboard input. The // Implement this structure to handle events related to keyboard input. The

6
include/capi/cef_life_span_handler_capi.h
View File

@ -38,13 +38,13 @@
#define CEF_INCLUDE_CAPI_CEF_LIFE_SPAN_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_LIFE_SPAN_HANDLER_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h"
struct _cef_client_t; struct _cef_client_t;
/// ///

8
include/capi/cef_load_handler_capi.h
View File

@ -38,14 +38,14 @@
#define CEF_INCLUDE_CAPI_CEF_LOAD_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_LOAD_HANDLER_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h" #include "include/capi/cef_browser_capi.h"
#include "include/capi/cef_frame_capi.h" #include "include/capi/cef_frame_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
/// ///
// Implement this structure to handle events related to browser load status. The // Implement this structure to handle events related to browser load status. The

4
include/capi/cef_menu_model_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_MENU_MODEL_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_MENU_MODEL_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Supports creation and modification of menus. See cef_menu_id_t for the // Supports creation and modification of menus. See cef_menu_id_t for the

4
include/capi/cef_origin_whitelist_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_ORIGIN_WHITELIST_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_ORIGIN_WHITELIST_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Add an entry to the cross-origin access whitelist. // Add an entry to the cross-origin access whitelist.

4
include/capi/cef_path_util_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_PATH_UTIL_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_PATH_UTIL_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Retrieve the path associated with the specified |key|. Returns true (1) on // Retrieve the path associated with the specified |key|. Returns true (1) on

6
include/capi/cef_process_message_capi.h
View File

@ -38,13 +38,13 @@
#define CEF_INCLUDE_CAPI_CEF_PROCESS_MESSAGE_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_PROCESS_MESSAGE_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_values_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_values_capi.h"
/// ///
// Structure representing a message. Can be used on any process and thread. // Structure representing a message. Can be used on any process and thread.

4
include/capi/cef_process_util_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_PROCESS_UTIL_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_PROCESS_UTIL_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Launches the process specified via |command_line|. Returns true (1) upon // Launches the process specified via |command_line|. Returns true (1) upon

6
include/capi/cef_render_handler_capi.h
View File

@ -38,13 +38,13 @@
#define CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_RENDER_HANDLER_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h"
/// ///
// Implement this structure to handle events when window rendering is disabled. // Implement this structure to handle events when window rendering is disabled.

8
include/capi/cef_render_process_handler_capi.h
View File

@ -38,10 +38,6 @@
#define CEF_INCLUDE_CAPI_CEF_RENDER_PROCESS_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_RENDER_PROCESS_HANDLER_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h" #include "include/capi/cef_browser_capi.h"
#include "include/capi/cef_dom_capi.h" #include "include/capi/cef_dom_capi.h"
@ -51,6 +47,10 @@ extern "C" {
#include "include/capi/cef_v8_capi.h" #include "include/capi/cef_v8_capi.h"
#include "include/capi/cef_values_capi.h" #include "include/capi/cef_values_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
/// ///
// Structure used to implement render process callbacks. The functions of this // Structure used to implement render process callbacks. The functions of this

4
include/capi/cef_request_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_REQUEST_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_REQUEST_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
struct _cef_post_data_element_t; struct _cef_post_data_element_t;
struct _cef_post_data_t; struct _cef_post_data_t;

4
include/capi/cef_request_context_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_request_context_handler_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_request_context_handler_capi.h"
/// ///
// A request context provides request handling for a set of related browser // A request context provides request handling for a set of related browser

6
include/capi/cef_request_context_handler_capi.h
View File

@ -38,13 +38,13 @@
#define CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_REQUEST_CONTEXT_HANDLER_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_cookie_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_cookie_capi.h"
/// ///
// Implement this structure to provide handler implementations. // Implement this structure to provide handler implementations.

8
include/capi/cef_request_handler_capi.h
View File

@ -38,10 +38,6 @@
#define CEF_INCLUDE_CAPI_CEF_REQUEST_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_REQUEST_HANDLER_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_auth_callback_capi.h" #include "include/capi/cef_auth_callback_capi.h"
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h" #include "include/capi/cef_browser_capi.h"
@ -51,6 +47,10 @@ extern "C" {
#include "include/capi/cef_response_capi.h" #include "include/capi/cef_response_capi.h"
#include "include/capi/cef_web_plugin_capi.h" #include "include/capi/cef_web_plugin_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
/// ///
// Callback structure used for asynchronous continuation of quota requests. // Callback structure used for asynchronous continuation of quota requests.

4
include/capi/cef_resource_bundle_handler_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_RESOURCE_BUNDLE_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_RESOURCE_BUNDLE_HANDLER_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Structure used to implement a custom resource bundle structure. The functions // Structure used to implement a custom resource bundle structure. The functions

8
include/capi/cef_resource_handler_capi.h
View File

@ -38,10 +38,6 @@
#define CEF_INCLUDE_CAPI_CEF_RESOURCE_HANDLER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_RESOURCE_HANDLER_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h" #include "include/capi/cef_browser_capi.h"
#include "include/capi/cef_callback_capi.h" #include "include/capi/cef_callback_capi.h"
@ -49,6 +45,10 @@ extern "C" {
#include "include/capi/cef_request_capi.h" #include "include/capi/cef_request_capi.h"
#include "include/capi/cef_response_capi.h" #include "include/capi/cef_response_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
/// ///
// Structure used to implement a custom request handler structure. The functions // Structure used to implement a custom request handler structure. The functions

4
include/capi/cef_response_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_RESPONSE_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_RESPONSE_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Structure used to represent a web response. The functions of this structure // Structure used to represent a web response. The functions of this structure

8
include/capi/cef_scheme_capi.h
View File

@ -38,10 +38,6 @@
#define CEF_INCLUDE_CAPI_CEF_SCHEME_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_SCHEME_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h" #include "include/capi/cef_browser_capi.h"
#include "include/capi/cef_frame_capi.h" #include "include/capi/cef_frame_capi.h"
@ -49,6 +45,10 @@ extern "C" {
#include "include/capi/cef_resource_handler_capi.h" #include "include/capi/cef_resource_handler_capi.h"
#include "include/capi/cef_response_capi.h" #include "include/capi/cef_response_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
struct _cef_scheme_handler_factory_t; struct _cef_scheme_handler_factory_t;
/// ///

4
include/capi/cef_stream_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_STREAM_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_STREAM_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Structure the client can implement to provide a custom stream reader. The // Structure the client can implement to provide a custom stream reader. The

4
include/capi/cef_string_visitor_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_STRING_VISITOR_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_STRING_VISITOR_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Implement this structure to receive string values asynchronously. // Implement this structure to receive string values asynchronously.

4
include/capi/cef_task_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_TASK_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_TASK_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Implement this structure for asynchronous task execution. If the task is // Implement this structure for asynchronous task execution. If the task is

6
include/capi/cef_trace_capi.h
View File

@ -38,13 +38,13 @@
#define CEF_INCLUDE_CAPI_CEF_TRACE_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_TRACE_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_callback_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_callback_capi.h"
/// ///
// Implement this structure to receive notification when tracing has completed. // Implement this structure to receive notification when tracing has completed.

4
include/capi/cef_url_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_URL_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_URL_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
/// ///
// Parse the specified |url| into its component parts. Returns false (0) if the // Parse the specified |url| into its component parts. Returns false (0) if the

8
include/capi/cef_urlrequest_capi.h
View File

@ -38,15 +38,15 @@
#define CEF_INCLUDE_CAPI_CEF_URLREQUEST_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_URLREQUEST_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_auth_callback_capi.h" #include "include/capi/cef_auth_callback_capi.h"
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_request_capi.h" #include "include/capi/cef_request_capi.h"
#include "include/capi/cef_response_capi.h" #include "include/capi/cef_response_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
struct _cef_urlrequest_client_t; struct _cef_urlrequest_client_t;
/// ///

8
include/capi/cef_v8_capi.h
View File

@ -38,15 +38,15 @@
#define CEF_INCLUDE_CAPI_CEF_V8_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_V8_CAPI_H_
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "include/capi/cef_base_capi.h" #include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h" #include "include/capi/cef_browser_capi.h"
#include "include/capi/cef_frame_capi.h" #include "include/capi/cef_frame_capi.h"
#include "include/capi/cef_task_capi.h" #include "include/capi/cef_task_capi.h"
#ifdef __cplusplus
extern "C" {
#endif
struct _cef_v8exception_t; struct _cef_v8exception_t;
struct _cef_v8handler_t; struct _cef_v8handler_t;
struct _cef_v8stack_frame_t; struct _cef_v8stack_frame_t;

4
include/capi/cef_values_capi.h
View File

@ -38,12 +38,12 @@
#define CEF_INCLUDE_CAPI_CEF_VALUES_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_VALUES_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
struct _cef_dictionary_value_t; struct _cef_dictionary_value_t;
struct _cef_list_value_t; struct _cef_list_value_t;

6
include/capi/cef_web_plugin_capi.h
View File

@ -38,13 +38,13 @@
#define CEF_INCLUDE_CAPI_CEF_WEB_PLUGIN_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_WEB_PLUGIN_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_browser_capi.h"
/// ///
// Information about a specific web plugin. // Information about a specific web plugin.

6
include/capi/cef_xml_reader_capi.h
View File

@ -38,13 +38,13 @@
#define CEF_INCLUDE_CAPI_CEF_XML_READER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_XML_READER_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_stream_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_stream_capi.h"
/// ///
// Structure that supports the reading of XML data via the libxml streaming API. // Structure that supports the reading of XML data via the libxml streaming API.

6
include/capi/cef_zip_reader_capi.h
View File

@ -38,13 +38,13 @@
#define CEF_INCLUDE_CAPI_CEF_ZIP_READER_CAPI_H_ #define CEF_INCLUDE_CAPI_CEF_ZIP_READER_CAPI_H_
#pragma once #pragma once
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_stream_capi.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "include/capi/cef_base_capi.h"
#include "include/capi/cef_stream_capi.h"
/// ///
// Structure that supports the reading of zip archives via the zlib unzip API. // Structure that supports the reading of zip archives via the zlib unzip API.

12
tools/make_capi_header.py
View File

@ -86,10 +86,6 @@ def make_capi_header(header, filename):
#define $GUARD$ #define $GUARD$
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
""" """
classes = header.get_classes(filename) classes = header.get_classes(filename)
@ -112,7 +108,13 @@ extern "C" {
else: else:
result += '#include "include/capi/cef_base_capi.h"\n' result += '#include "include/capi/cef_base_capi.h"\n'
result += '\n' result += \
"""
#ifdef __cplusplus
extern "C" {
#endif
"""
# output forward declarations # output forward declarations
if len(all_declares) > 0: if len(all_declares) > 0: